diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile index 19c0781c..fa5fabae 100644 --- a/29/apache/Dockerfile +++ b/29/apache/Dockerfile @@ -67,16 +67,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.24; \ - pecl install igbinary-3.2.16; \ pecl install imagick-3.7.0; \ - pecl install memcached-3.3.0 \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-6.1.0 \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-3.3.0; \ + pecl install redis-6.1.0; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -112,11 +108,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile index bdec7b10..61c6de6e 100644 --- a/29/fpm-alpine/Dockerfile +++ b/29/fpm-alpine/Dockerfile @@ -64,16 +64,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.24; \ - pecl install igbinary-3.2.16; \ pecl install imagick-3.7.0; \ - pecl install memcached-3.3.0 \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-6.1.0 \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-3.3.0; \ + pecl install redis-6.1.0; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -107,11 +103,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile index ae7c527c..2a64b02a 100644 --- a/29/fpm/Dockerfile +++ b/29/fpm/Dockerfile @@ -67,16 +67,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.24; \ - pecl install igbinary-3.2.16; \ pecl install imagick-3.7.0; \ - pecl install memcached-3.3.0 \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-6.1.0 \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-3.3.0; \ + pecl install redis-6.1.0; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -112,11 +108,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 4334e170..f82a1d9e 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -67,16 +67,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.24; \ - pecl install igbinary-3.2.16; \ pecl install imagick-3.7.0; \ - pecl install memcached-3.3.0 \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-6.1.0 \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-3.3.0; \ + pecl install redis-6.1.0; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -112,11 +108,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 6ca9bda9..26e4a568 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -64,16 +64,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.24; \ - pecl install igbinary-3.2.16; \ pecl install imagick-3.7.0; \ - pecl install memcached-3.3.0 \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-6.1.0 \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-3.3.0; \ + pecl install redis-6.1.0; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -107,11 +103,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index f13ce297..c0769823 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -67,16 +67,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.24; \ - pecl install igbinary-3.2.16; \ pecl install imagick-3.7.0; \ - pecl install memcached-3.3.0 \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-6.1.0 \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-3.3.0; \ + pecl install redis-6.1.0; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -112,11 +108,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cf6af0ff..c5517536 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -63,16 +63,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-%%APCU_VERSION%%; \ - pecl install igbinary-%%IGBINARY_VERSION%%; \ pecl install imagick-%%IMAGICK_VERSION%%; \ - pecl install memcached-%%MEMCACHED_VERSION%% \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-%%REDIS_VERSION%% \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-%%MEMCACHED_VERSION%%; \ + pecl install redis-%%REDIS_VERSION%%; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -106,11 +102,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index cadae18a..9695c010 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -66,16 +66,12 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-%%APCU_VERSION%%; \ - pecl install igbinary-%%IGBINARY_VERSION%%; \ pecl install imagick-%%IMAGICK_VERSION%%; \ - pecl install memcached-%%MEMCACHED_VERSION%% \ - --configureoptions 'enable-memcached-igbinary="yes"'; \ - pecl install redis-%%REDIS_VERSION%% \ - --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \ + pecl install memcached-%%MEMCACHED_VERSION%%; \ + pecl install redis-%%REDIS_VERSION%%; \ \ docker-php-ext-enable \ apcu \ - igbinary \ imagick \ memcached \ redis \ @@ -111,11 +107,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ \ - { \ - echo 'apc.serializer=igbinary'; \ - echo 'session.serialize_handler=igbinary'; \ - } >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \ - \ { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ diff --git a/update.sh b/update.sh index f55da259..9898a6c0 100755 --- a/update.sh +++ b/update.sh @@ -44,24 +44,6 @@ apcu_version="$( | tail -1 )" -igbinary_version="$( - git ls-remote --tags https://github.com/igbinary/igbinary.git \ - | cut -d/ -f3 \ - | grep -viE '[a-z]' \ - | tr -d '^{}' \ - | sort -V \ - | tail -1 -)" - -imagick_version="$( - git ls-remote --tags https://github.com/mkoppanen/imagick.git \ - | cut -d/ -f3 \ - | grep -viE '[a-z]' \ - | tr -d '^{}' \ - | sort -V \ - | tail -1 -)" - memcached_version="$( git ls-remote --tags https://github.com/php-memcached-dev/php-memcached.git \ | cut -d/ -f3 \ @@ -80,12 +62,20 @@ redis_version="$( | tail -1 )" +imagick_version="$( + git ls-remote --tags https://github.com/mkoppanen/imagick.git \ + | cut -d/ -f3 \ + | grep -viE '[a-z]' \ + | tr -d '^{}' \ + | sort -V \ + | tail -1 +)" + declare -A pecl_versions=( [APCu]="$apcu_version" - [igbinary]="$igbinary_version" - [imagick]="$imagick_version" [memcached]="$memcached_version" [redis]="$redis_version" + [imagick]="$imagick_version" ) variants=( @@ -131,10 +121,9 @@ function create_variant() { s/%%CMD%%/'"${cmd[$variant]}"'/g; s|%%VARIANT_EXTRAS%%|'"${extras[$variant]}"'|g; s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g; - s/%%IGBINARY_VERSION%%/'"${pecl_versions[igbinary]}"'/g; - s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g; s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g; s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; + s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g; s/%%CRONTAB_INT%%/'"$crontabInt"'/g; ' "$dir/Dockerfile"