From 9ecaf51c4f34a53c2a2f82b55af50777b1900366 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 11 Dec 2018 00:07:49 +0100 Subject: [PATCH 1/4] Use PHP 7.3 for NC 15 Signed-off-by: J0WI --- 15.0/apache/Dockerfile | 3 ++- 15.0/fpm-alpine/Dockerfile | 3 ++- 15.0/fpm/Dockerfile | 3 ++- Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + update.sh | 11 +++++++++-- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 79aa5c62..57ae0a21 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.2-apache-stretch +FROM php:7.3-apache-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -34,6 +34,7 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile index 01de0270..70355541 100644 --- a/15.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.2-fpm-alpine3.8 +FROM php:7.3-fpm-alpine3.8 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -25,6 +25,7 @@ RUN set -ex; \ libpng-dev \ libmemcached-dev \ libxml2-dev \ + libzip-dev \ openldap-dev \ pcre-dev \ postgresql-dev \ diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index 70e5ed22..ee5e7ac6 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.2-fpm-stretch +FROM php:7.3-fpm-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -34,6 +34,7 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4d282f54..af584b5e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -24,6 +24,7 @@ RUN set -ex; \ libpng-dev \ libmemcached-dev \ libxml2-dev \ + libzip-dev \ openldap-dev \ pcre-dev \ postgresql-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index d10ae367..1b264823 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -33,6 +33,7 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ diff --git a/update.sh b/update.sh index 8a323635..26e54424 100755 --- a/update.sh +++ b/update.sh @@ -3,7 +3,7 @@ set -eo pipefail declare -A php_version=( [default]='7.2' - [12.0]='7.1' + [15.0]='7.3' ) declare -A cmd=( @@ -58,6 +58,7 @@ travisEnv= function create_variant() { dir="$1/$variant" + phpVersion=${php_version[$version]-${php_version[default]}} # Create the version+variant directory with a Dockerfile. mkdir -p "$dir" @@ -70,7 +71,7 @@ function create_variant() { # Replace the variables. sed -ri -e ' - s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g; + s/%%PHP_VERSION%%/'"$phpVersion"'/g; s/%%VARIANT%%/'"$variant"'/g; s/%%VERSION%%/'"$fullversion"'/g; s/%%BASE_DOWNLOAD_URL%%/'"$2"'/g; @@ -82,6 +83,12 @@ function create_variant() { s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g; ' "$dir/Dockerfile" + if [[ "$phpVersion" != 7.3 ]]; then + sed -ri \ + -e '/libzip-dev/d' \ + "$dir/Dockerfile" + fi + # Copy the shell scripts for name in entrypoint cron; do cp "docker-$name.sh" "$dir/$name.sh" From 5bd47f81594091fb61a74f8c07eaf2d1331f01f7 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 22 Dec 2018 17:14:05 +0100 Subject: [PATCH 2/4] Update php-memcached to 3.1.2 and APCu to 5.1.16 Signed-off-by: J0WI --- 13.0/apache/Dockerfile | 5 +++-- 13.0/fpm-alpine/Dockerfile | 5 +++-- 13.0/fpm/Dockerfile | 5 +++-- 14.0/apache/Dockerfile | 5 +++-- 14.0/fpm-alpine/Dockerfile | 5 +++-- 14.0/fpm/Dockerfile | 5 +++-- 15.0/apache/Dockerfile | 5 +++-- 15.0/fpm-alpine/Dockerfile | 5 +++-- 15.0/fpm/Dockerfile | 5 +++-- Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + update.sh | 4 ++-- 12 files changed, 31 insertions(+), 20 deletions(-) diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index 355af907..bde3ca46 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -52,8 +53,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 58a214df..6eb98241 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -20,6 +20,7 @@ RUN set -ex; \ autoconf \ freetype-dev \ icu-dev \ + libevent-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ libpng-dev \ @@ -46,8 +47,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 0e33cd1f..080eb7d3 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -52,8 +53,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index d2eb99f8..64ed7f0c 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -52,8 +53,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile index 2d4b55a1..5c3d8040 100644 --- a/14.0/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -20,6 +20,7 @@ RUN set -ex; \ autoconf \ freetype-dev \ icu-dev \ + libevent-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ libpng-dev \ @@ -46,8 +47,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index 5491e623..a547b05f 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -52,8 +53,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 57ae0a21..0f4ed34c 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -53,8 +54,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile index 70355541..40183188 100644 --- a/15.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -20,6 +20,7 @@ RUN set -ex; \ autoconf \ freetype-dev \ icu-dev \ + libevent-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ libpng-dev \ @@ -47,8 +48,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index ee5e7ac6..b2d17da1 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -53,8 +54,8 @@ 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.15; \ - pecl install memcached-3.0.4; \ + pecl install APCu-5.1.16; \ + pecl install memcached-3.1.2; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index af584b5e..6b92d863 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -19,6 +19,7 @@ RUN set -ex; \ autoconf \ freetype-dev \ icu-dev \ + libevent-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ libpng-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 1b264823..c4c01814 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -23,6 +23,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ libcurl4-openssl-dev \ + libevent-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ diff --git a/update.sh b/update.sh index 26e54424..16cea76c 100755 --- a/update.sh +++ b/update.sh @@ -25,8 +25,8 @@ declare -A extras=( ) declare -A pecl_versions=( - [APCu]='5.1.15' - [memcached]='3.0.4' + [APCu]='5.1.16' + [memcached]='3.1.2' [redis]='4.2.0' [imagick]='3.4.3' ) From 06c299ce5b584f6af531d35e55ef9c1e2e2490b9 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 5 Jan 2019 17:43:42 +0100 Subject: [PATCH 3/4] Update memcached to 3.1.3 Signed-off-by: J0WI --- 13.0/apache/Dockerfile | 2 +- 13.0/fpm-alpine/Dockerfile | 2 +- 13.0/fpm/Dockerfile | 2 +- 14.0/apache/Dockerfile | 2 +- 14.0/fpm-alpine/Dockerfile | 2 +- 14.0/fpm/Dockerfile | 2 +- 15.0/apache/Dockerfile | 2 +- 15.0/fpm-alpine/Dockerfile | 2 +- 15.0/fpm/Dockerfile | 2 +- update.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index bde3ca46..17a42dc4 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -54,7 +54,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 6eb98241..d5ddd23f 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -48,7 +48,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 080eb7d3..2199ad5b 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -54,7 +54,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index 64ed7f0c..d049dd7d 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -54,7 +54,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile index 5c3d8040..29fc9671 100644 --- a/14.0/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -48,7 +48,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index a547b05f..81f13f36 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -54,7 +54,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 0f4ed34c..f007010e 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -55,7 +55,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile index 40183188..7a66f38a 100644 --- a/15.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -49,7 +49,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index b2d17da1..3eea2541 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -55,7 +55,7 @@ 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.16; \ - pecl install memcached-3.1.2; \ + pecl install memcached-3.1.3; \ pecl install redis-4.2.0; \ pecl install imagick-3.4.3; \ \ diff --git a/update.sh b/update.sh index 16cea76c..9b6149d7 100755 --- a/update.sh +++ b/update.sh @@ -26,7 +26,7 @@ declare -A extras=( declare -A pecl_versions=( [APCu]='5.1.16' - [memcached]='3.1.2' + [memcached]='3.1.3' [redis]='4.2.0' [imagick]='3.4.3' ) From 46c774cd8ccc83602116519a19526e479b3cf2a6 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 14 Jan 2019 17:10:19 +0100 Subject: [PATCH 4/4] Set default PHP version to 7.3 Signed-off-by: J0WI --- update.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index 9b6149d7..31dd6182 100755 --- a/update.sh +++ b/update.sh @@ -2,8 +2,9 @@ set -eo pipefail declare -A php_version=( - [default]='7.2' - [15.0]='7.3' + [default]='7.3' + [14.0]='7.2' + [13.0]='7.2' ) declare -A cmd=(