From d06375a333380d97db61ef4816334cebf634b214 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 17 Jan 2019 13:42:00 +0100 Subject: [PATCH 1/2] Switch back to php 7.2 Signed-off-by: Tilo Spannagel --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 31dd6182..12db63dd 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ set -eo pipefail declare -A php_version=( - [default]='7.3' + [default]='7.2' [14.0]='7.2' [13.0]='7.2' ) From d8d9a17be25ea0b3acd34914065cb1f085d36ec6 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 17 Jan 2019 13:43:13 +0100 Subject: [PATCH 2/2] Run update.sh Signed-off-by: Tilo Spannagel --- 15.0/apache/Dockerfile | 3 +-- 15.0/fpm-alpine/Dockerfile | 3 +-- 15.0/fpm/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 5fad6022..09e87842 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.3-apache-stretch +FROM php:7.2-apache-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -35,7 +35,6 @@ 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 cdc04ec2..1e5b23fa 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.3-fpm-alpine3.8 +FROM php:7.2-fpm-alpine3.8 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -26,7 +26,6 @@ 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 59877ab2..0e6ffcd1 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.3-fpm-stretch +FROM php:7.2-fpm-stretch # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -35,7 +35,6 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ - libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \