From: Thomas Bruederli <redacted>
Date: Wed, 3 Feb 2021 19:46:57 +0000 (+0100)
Subject: Update to php:7.4 base images
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7294dfa8a43f1ec036edf77390210912080e50e4;p=roundcube-roundcubemail-docker.git

Update to php:7.4 base images
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index df2dab8..9a47d4f 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -19,7 +19,7 @@ RUN set -ex; \
 	; \
 	\
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-	docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install \
 		exif \
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index e251a16..1910c31 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-alpine
+FROM php:7.4-fpm-alpine
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 # entrypoint.sh and installto.sh dependencies
@@ -25,7 +25,7 @@ RUN set -ex; \
 		sqlite-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install \
 		exif \
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index a679643..7c0b441 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm
+FROM php:7.4-fpm
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -19,7 +19,7 @@ RUN set -ex; \
 	; \
 	\
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-	docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install \
 		exif \
diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index 37a6648..a5da1a8 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -1,4 +1,4 @@
-FROM php:7.3-%%VARIANT%%
+FROM php:7.4-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 # entrypoint.sh and installto.sh dependencies
@@ -25,7 +25,7 @@ RUN set -ex; \
 		sqlite-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install \
 		exif \
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 89f0b7d..7c48d38 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -1,4 +1,4 @@
-FROM php:7.3-%%VARIANT%%
+FROM php:7.4-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -19,7 +19,7 @@ RUN set -ex; \
 	; \
 	\
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-	docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install \
 		exif \