From 7e390bc4b595ed31b421ce4ac97add1d332f4aca Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 8 Mar 2018 09:38:24 +0100 Subject: [PATCH 1/2] Use var for pecl package versions --- Dockerfile-alpine.template | 6 +++--- Dockerfile-debian.template | 6 +++--- update.sh | 9 +++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0e0c6cea..b1a0f96b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -49,9 +49,9 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ - memcached-3.0.4 \ - redis-3.1.6 \ + APCu-%%APCU_VERSION%% \ + memcached-%%MEMCACHED_VERSION%% \ + redis-%%REDIS_VERSION%% \ ; \ docker-php-ext-enable \ apcu \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 742f0227..a5db872a 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -53,9 +53,9 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ - memcached-3.0.4 \ - redis-3.1.6 \ + APCu-%%APCU_VERSION%% \ + memcached-%%MEMCACHED_VERSION%% \ + redis-%%REDIS_VERSION%% \ ; \ docker-php-ext-enable \ apcu \ diff --git a/update.sh b/update.sh index dfe2170f..f8da8763 100755 --- a/update.sh +++ b/update.sh @@ -19,6 +19,12 @@ declare -A extras=( [fpm-alpine]='' ) +declare -A pecl_versions=( + [APCu]='5.1.10' + [memcached]='3.0.4' + [redis]='3.1.6' +) + # version_greater_or_equal A B returns whether A >= B function version_greater_or_equal() { [[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" || "$1" == "$2" ]]; @@ -57,6 +63,9 @@ for latest in "${latests[@]}"; do s/%%VERSION%%/'"$latest"'/g; s/%%CMD%%/'"${cmd[$variant]}"'/g; s/%%VARIANT_EXTRAS%%/'"${extras[$variant]}"'/g; + s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g; + s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g; + s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; ' "$version/$variant/Dockerfile" # Copy the shell scripts From 33bc471dbc9ab6804a337ba84c60e9f4f69a8307 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 8 Mar 2018 09:41:24 +0100 Subject: [PATCH 2/2] Update APCu to version 5.1.11 --- 11.0/apache/Dockerfile | 2 +- 11.0/fpm-alpine/Dockerfile | 2 +- 11.0/fpm/Dockerfile | 2 +- 12.0/apache/Dockerfile | 2 +- 12.0/fpm-alpine/Dockerfile | 2 +- 12.0/fpm/Dockerfile | 2 +- 13.0/apache/Dockerfile | 2 +- 13.0/fpm-alpine/Dockerfile | 2 +- 13.0/fpm/Dockerfile | 2 +- update.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index 9f0dbf5d..88d14721 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/11.0/fpm-alpine/Dockerfile b/11.0/fpm-alpine/Dockerfile index 7600c901..0e352c41 100644 --- a/11.0/fpm-alpine/Dockerfile +++ b/11.0/fpm-alpine/Dockerfile @@ -49,7 +49,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 1ad54cb7..f176960b 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 69aed2c1..28a9dde2 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index 98952a8e..57ac1bc7 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -49,7 +49,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 4ac2d117..4202bf00 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index ca993c8f..b2a965f9 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 1024772c..e2c9a8d6 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -49,7 +49,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index e8cc1a2a..0e4b650a 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex; \ zip \ ; \ pecl install \ - APCu-5.1.10 \ + APCu-5.1.11 \ memcached-3.0.4 \ redis-3.1.6 \ ; \ diff --git a/update.sh b/update.sh index f8da8763..dc54b070 100755 --- a/update.sh +++ b/update.sh @@ -20,7 +20,7 @@ declare -A extras=( ) declare -A pecl_versions=( - [APCu]='5.1.10' + [APCu]='5.1.11' [memcached]='3.0.4' [redis]='3.1.6' )