Upgrade PHP to 7.4 for 19.0 (#1108)

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

6 files changed, 25 insertions, 18 deletions

diff --git a/19.0-rc/apache/Dockerfile b/19.0-rc/apache/Dockerfile
index 4c86932e..24db04a0 100644
--- a/19.0-rc/apache/Dockerfile
+++ b/19.0-rc/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-buster
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -41,9 +41,7 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         exif \
diff --git a/19.0-rc/fpm-alpine/Dockerfile b/19.0-rc/fpm-alpine/Dockerfile
index ae0c6459..d85293ba 100644
--- a/19.0-rc/fpm-alpine/Dockerfile
+++ b/19.0-rc/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.11
+FROM php:7.4-fpm-alpine3.11
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -35,7 +35,7 @@ RUN set -ex; \
         gmp-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         exif \
diff --git a/19.0-rc/fpm/Dockerfile b/19.0-rc/fpm/Dockerfile
index 5d07b17c..f5c40e62 100644
--- a/19.0-rc/fpm/Dockerfile
+++ b/19.0-rc/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
+FROM php:7.4-fpm-buster
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -41,9 +41,7 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         exif \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 0840ade0..6cf338a6 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -34,7 +34,7 @@ RUN set -ex; \
         gmp-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         exif \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 9345d2ef..361a5eb1 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -41,7 +41,7 @@ RUN set -ex; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
diff --git a/update.sh b/update.sh
index 9fa90267..8cb55e85 100755
--- a/update.sh
+++ b/update.sh
@@ -2,7 +2,10 @@
 set -eo pipefail
 
 declare -A php_version=(
-	[default]='7.3'
+	[default]='7.4'
+	[18.0]='7.3'
+	[17.0]='7.3'
+	[16.0]='7.3'
 )
 
 declare -A cmd=(
@@ -130,11 +133,19 @@ function create_variant() {
 		s/%%CRONTAB_INT%%/'"$crontabInt"'/g;
 	' "$dir/Dockerfile"
 
-	if [[ "$phpVersion" != 7.3 ]]; then
-		sed -ri \
-			-e '/libzip-dev/d' \
-			"$dir/Dockerfile"
-	fi
+	case "$phpVersion" in
+		7.4 )
+			sed -ri -e '
+				\@docker-php-ext-configure gmp --with-gmp@d;
+				\@/usr/include/gmp.h@d;
+				' "$dir/Dockerfile"
+			;;
+		7.3 )
+			sed -ri -e '
+				s@gd --with-freetype --with-jpeg --with-webp@gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr@g;
+				' "$dir/Dockerfile"
+			;;
+	esac
 
 	# Copy the shell scripts
 	for name in entrypoint cron; do