Update to php:7.4 base images

diff --git a/apache/Dockerfile b/apache/Dockerfile
index df2dab8153b6e0c0aff51232f125f2c309ee6f66..9a47d4f71cbf1d4062c170f020f85c0aa4719ea8 100644 (file)
--- 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 e251a16193424de9af0dbabc8e6738fbb9019648..1910c319cbd5c31eec2eabd8a52e862339834cc1 100644 (file)
--- 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 a6796433f8b57c1bf7b30b4158774a3d5a4f6e1b..7c0b441acd5fca8796c39aaabbf460509d5db1f9 100644 (file)
--- 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 37a66480f7731ed5729984281be748b25d18d3dc..a5da1a8421ca22b0d42a1933377cbf853e436553 100644 (file)
--- 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 89f0b7d6fab12e0be362a34def259178423c748a..7c48d38673c4102375b0b40a7c6b3e3792643972 100644 (file)
--- 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 \