diff options
author | Tilo Spannagel <development@tilosp.de> | 2018-03-08 10:39:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-08 10:39:04 +0100 |
commit | 5c05c9eba0a97e36fca6d0e00a4da66db9544b9c (patch) | |
tree | dd4a702d32962bcd654e141e8054f9354e390287 | |
parent | f0e9f272b03cb9f6da32317d4f24f6935b09ed98 (diff) | |
parent | 33bc471dbc9ab6804a337ba84c60e9f4f69a8307 (diff) |
Merge pull request #273 from nextcloud/APCu-5.1.11
Update APCu to version 5.1.11
-rw-r--r-- | 11.0/apache/Dockerfile | 2 | ||||
-rw-r--r-- | 11.0/fpm-alpine/Dockerfile | 2 | ||||
-rw-r--r-- | 11.0/fpm/Dockerfile | 2 | ||||
-rw-r--r-- | 12.0/apache/Dockerfile | 2 | ||||
-rw-r--r-- | 12.0/fpm-alpine/Dockerfile | 2 | ||||
-rw-r--r-- | 12.0/fpm/Dockerfile | 2 | ||||
-rw-r--r-- | 13.0/apache/Dockerfile | 2 | ||||
-rw-r--r-- | 13.0/fpm-alpine/Dockerfile | 2 | ||||
-rw-r--r-- | 13.0/fpm/Dockerfile | 2 | ||||
-rw-r--r-- | Dockerfile-alpine.template | 6 | ||||
-rw-r--r-- | Dockerfile-debian.template | 6 | ||||
-rwxr-xr-x | update.sh | 9 |
12 files changed, 24 insertions, 15 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/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 \ @@ -19,6 +19,12 @@ declare -A extras=( [fpm-alpine]='' ) +declare -A pecl_versions=( + [APCu]='5.1.11' + [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 |