From 09151270f2fb0ccf7de1420d5fa2f31fedd5d749 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 8 Apr 2019 14:13:52 +0200 Subject: [PATCH] Set default PHP version to 7.3 Fixes #571 Signed-off-by: J0WI --- 15.0/apache/Dockerfile | 3 ++- 15.0/fpm-alpine/Dockerfile | 3 ++- 15.0/fpm/Dockerfile | 3 ++- 16.0-beta/apache/Dockerfile | 3 ++- 16.0-beta/fpm-alpine/Dockerfile | 3 ++- 16.0-beta/fpm/Dockerfile | 3 ++- update.sh | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 6fb2f0d..cf64a18 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; \ @@ -35,6 +35,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 2f69a09..457a900 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.9 +FROM php:7.3-fpm-alpine3.9 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -26,6 +26,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 9334e15..5d94708 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; \ @@ -35,6 +35,7 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ diff --git a/16.0-beta/apache/Dockerfile b/16.0-beta/apache/Dockerfile index 72f8b52..77df744 100644 --- a/16.0-beta/apache/Dockerfile +++ b/16.0-beta/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; \ @@ -35,6 +35,7 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libzip-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ diff --git a/16.0-beta/fpm-alpine/Dockerfile b/16.0-beta/fpm-alpine/Dockerfile index 03bdbcb..cc2406f 100644 --- a/16.0-beta/fpm-alpine/Dockerfile +++ b/16.0-beta/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.2-fpm-alpine3.9 +FROM php:7.3-fpm-alpine3.9 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -26,6 +26,7 @@ RUN set -ex; \ libpng-dev \ libmemcached-dev \ libxml2-dev \ + libzip-dev \ openldap-dev \ pcre-dev \ postgresql-dev \ diff --git a/16.0-beta/fpm/Dockerfile b/16.0-beta/fpm/Dockerfile index 027ba06..292af64 100644 --- a/16.0-beta/fpm/Dockerfile +++ b/16.0-beta/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; \ @@ -35,6 +35,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 c5153f7..d645f4a 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ set -eo pipefail declare -A php_version=( - [default]='7.2' + [default]='7.3' [14.0]='7.2' )