diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a3fe58..0a5c521 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
* `grpc` extension
+* `event` extension
### Changed
@@ -18,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Deprecated
-*None*
+* Spiral docker images
### Removed
diff --git a/Makefile b/Makefile
index ad2663d..c12a867 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,4 @@ include base74.mk
include base80.mk
include base81.mk
-include spiral74.mk
-include spiral80.mk
-include spiral81.mk
-
-all: base74 base80 base81 spiral74 spiral80 spiral81
+all: base74 base80 base81
diff --git a/README.md b/README.md
index 4f75ef8..5e71690 100644
--- a/README.md
+++ b/README.md
@@ -19,15 +19,16 @@ Simple image with PHP, RoadRunner and pre-installed extensions:
* `spacetabio/roadrunner-alpine:8.1-base-1.9.0`
-* `spacetabio/roadrunner-alpine:7.4-spiral-1.9.0`
-
-
-* `spacetabio/roadrunner-alpine:8.0-spiral-1.9.0`
-
-
-* `spacetabio/roadrunner-alpine:8.1-spiral-1.9.0`
-
-
+* DEPRECATED:
+* `spacetabio/roadrunner-alpine:7.4-spiral-1.8.0`
+
+
+* `spacetabio/roadrunner-alpine:8.0-spiral-1.8.0`
+
+
+* `spacetabio/roadrunner-alpine:8.1-spiral-1.8.0`
+
+
With xdebug:
@@ -40,15 +41,16 @@ With xdebug:
* `spacetabio/roadrunner-alpine:8.1-base-xdebug-1.9.0`
-* `spacetabio/roadrunner-alpine:7.4-spiral-xdebug-1.9.0`
-
-
-* `spacetabio/roadrunner-alpine:8.0-spiral-xdebug-1.9.0`
-
-
-* `spacetabio/roadrunner-alpine:8.1-spiral-xdebug-1.9.0`
-
-
+* DEPRECATED:
+* `spacetabio/roadrunner-alpine:7.4-spiral-xdebug-1.8.0`
+
+
+* `spacetabio/roadrunner-alpine:8.0-spiral-xdebug-1.8.0`
+
+
+* `spacetabio/roadrunner-alpine:8.1-spiral-xdebug-1.8.0`
+
+
## Basic usage
@@ -87,6 +89,8 @@ As default php-extensions are pre-installed:
* `exif`
* `zip`
* `bcmath`
+ * `grpc`
+ * `event`
## Configure
@@ -126,7 +130,8 @@ ENV PHP_OPCACHE_FILE_CACHE_ONLY=1
Format: `{phpVersion}-{imageType}-{semverImageVersion}`
Map:
- - Image tag `*-1.9.0+` contains RoadRunner `2.7.3` and Spiral binary (in separate images).
+ - Image tag `*-1.9.0+` contains RoadRunner `2.11.4`
+ - Image tag `*-1.8.0+` contains RoadRunner `2.7.3` and Spiral binary (in separate images).
- Image tag `*-1.7.0+` contains RoadRunner `2.5.6` and Spiral binary (in separate images).
- Image tag `*-1.6.0+` contains RoadRunner `2.4.2` and Spiral binary (in separate images).
- Image tag `*-1.5.0+` contains RoadRunner `2.3.3` and Spiral binary (in separate images).
diff --git a/base-xdebug/7.4/alpine.dockerfile b/base-xdebug/7.4/alpine.dockerfile
index 630698a..a6ca692 100644
--- a/base-xdebug/7.4/alpine.dockerfile
+++ b/base-xdebug/7.4/alpine.dockerfile
@@ -1,17 +1,11 @@
FROM php:7.4-cli-alpine AS build
-RUN apk add --update --no-cache bash pcre icu yaml libuv libpq libpng libjpeg libexif libzip freetype \
- && apk add --update --no-cache --virtual build-dependencies \
- autoconf g++ libtool pcre make icu-dev postgresql-dev \
- postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure opcache --enable-opcache \
- && docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
- && pecl install yaml \
- && docker-php-ext-enable yaml \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- && apk del build-dependencies
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/install-php-extensions \
+ && install-php-extensions gd yaml grpc opcache pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath event xdebug
+
+RUN apk add --update --no-cache make
ENV ROADRUNNER_VERSION=2.11.4
RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
diff --git a/base-xdebug/8.0/alpine.dockerfile b/base-xdebug/8.0/alpine.dockerfile
index 8fe32c4..8bbb165 100644
--- a/base-xdebug/8.0/alpine.dockerfile
+++ b/base-xdebug/8.0/alpine.dockerfile
@@ -1,17 +1,11 @@
FROM php:8.0-cli-alpine AS build
-RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg libexif libzip freetype \
- && apk add --update --no-cache --virtual build-dependencies \
- autoconf g++ libtool pcre make icu-dev postgresql-dev \
- postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure opcache --enable-opcache \
- && docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
- && pecl install yaml \
- && docker-php-ext-enable yaml \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- && apk del build-dependencies
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/install-php-extensions \
+ && install-php-extensions gd yaml grpc opcache pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath event xdebug
+
+RUN apk add --update --no-cache make
ENV ROADRUNNER_VERSION=2.11.4
RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
diff --git a/base-xdebug/8.1/alpine.dockerfile b/base-xdebug/8.1/alpine.dockerfile
index 35a7828..7476e3a 100644
--- a/base-xdebug/8.1/alpine.dockerfile
+++ b/base-xdebug/8.1/alpine.dockerfile
@@ -1,18 +1,11 @@
FROM php:8.1-cli-alpine AS build
-RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg libexif libzip freetype \
- && apk add --update --no-cache --virtual build-dependencies \
- autoconf g++ libtool pcre make icu-dev postgresql-dev \
- postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure opcache --enable-opcache \
- && docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
- && pecl install xdebug \
- && docker-php-ext-enable xdebug \
- && apk del build-dependencies
-
-# && pecl install yaml \
-# && docker-php-ext-enable yaml \
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/install-php-extensions \
+ && install-php-extensions gd yaml grpc opcache pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath event xdebug
+
+RUN apk add --update --no-cache make
ENV ROADRUNNER_VERSION=2.11.4
RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
diff --git a/base/7.4/alpine.dockerfile b/base/7.4/alpine.dockerfile
index be329aa..b9a267a 100644
--- a/base/7.4/alpine.dockerfile
+++ b/base/7.4/alpine.dockerfile
@@ -1,15 +1,11 @@
FROM php:7.4-cli-alpine AS build
-RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip freetype \
- && apk add --update --no-cache --virtual build-dependencies \
- autoconf g++ libtool pcre make icu-dev postgresql-dev \
- postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure opcache --enable-opcache \
- && docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
- && pecl install yaml \
- && docker-php-ext-enable yaml \
- && apk del build-dependencies
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/install-php-extensions \
+ && install-php-extensions gd yaml grpc opcache pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath event
+
+RUN apk add --update --no-cache make
ENV ROADRUNNER_VERSION=2.11.4
RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
diff --git a/base/8.0/alpine.dockerfile b/base/8.0/alpine.dockerfile
index 8385055..467c15c 100644
--- a/base/8.0/alpine.dockerfile
+++ b/base/8.0/alpine.dockerfile
@@ -1,15 +1,11 @@
FROM php:8.0-cli-alpine AS build
-RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip freetype \
- && apk add --update --no-cache --virtual build-dependencies \
- autoconf g++ libtool pcre make icu-dev postgresql-dev \
- postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure opcache --enable-opcache \
- && docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
- && pecl install yaml \
- && docker-php-ext-enable yaml \
- && apk del build-dependencies
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/install-php-extensions \
+ && install-php-extensions gd yaml grpc opcache pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath event
+
+RUN apk add --update --no-cache make
ENV ROADRUNNER_VERSION=2.11.4
RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \
diff --git a/base/8.1/alpine.dockerfile b/base/8.1/alpine.dockerfile
index a15c257..dea4eca 100644
--- a/base/8.1/alpine.dockerfile
+++ b/base/8.1/alpine.dockerfile
@@ -1,18 +1,11 @@
FROM php:8.1-cli-alpine AS build
-RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip freetype \
- && apk add --update --no-cache --virtual build-dependencies \
- autoconf g++ libtool pcre make icu-dev postgresql-dev \
- postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev \
- libexif-dev libpng-dev libzip-dev ${PHPIZE_DEPS} \
- && docker-php-ext-configure gd --with-freetype --with-jpeg \
- && docker-php-ext-configure opcache --enable-opcache \
- && docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath \
- && pecl install yaml \
- && docker-php-ext-enable yaml \
- && pecl install grpc \
- && docker-php-ext-enable grpc \
- && apk del build-dependencies ${PHPIZE_DEPS}
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/install-php-extensions \
+ && install-php-extensions gd yaml grpc opcache pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip bcmath event
+
+RUN apk add --update --no-cache make
ENV ROADRUNNER_VERSION=2.11.4
RUN wget -O rr.tar.gz "https://github.com/roadrunner-server/roadrunner/releases/download/v${ROADRUNNER_VERSION}/roadrunner-${ROADRUNNER_VERSION}-linux-amd64.tar.gz" \