Merge pull request #273 from nextcloud/APCu-5.1.11

Update APCu to version 5.1.11
nextcloud · Mar 8, 2018 · 5c05c9e · 5c05c9e
2 parents f0e9f27 + 33bc471
commit 5c05c9e
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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