Fix PHP GD configuration (see https://github.com/docker-library/php/issues/912#issuecomment-559918036 for details)

2022-01-05 12:00:22 +01:00 · 2022-01-05 12:00:22 +01:00 · 760cf75e3a
commit 760cf75e3a
--- a/2021.09/apache/Dockerfile
+++ b/2021.09/apache/Dockerfile
@ -73,10 +73,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
--- a/2021.09/fpm-alpine/Dockerfile
+++ b/2021.09/fpm-alpine/Dockerfile
@ -62,10 +62,8 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
--- a/2021.09/fpm/Dockerfile
+++ b/2021.09/fpm/Dockerfile
@ -73,10 +73,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
--- a/2021.12-dev/apache/Dockerfile
+++ b/2021.12-dev/apache/Dockerfile
@ -73,10 +73,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
--- a/2021.12-dev/fpm-alpine/Dockerfile
+++ b/2021.12-dev/fpm-alpine/Dockerfile
@ -62,10 +62,8 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
--- a/2021.12-dev/fpm/Dockerfile
+++ b/2021.12-dev/fpm/Dockerfile
@ -73,10 +73,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
--- a/2021.12-rc/apache/Dockerfile
+++ b/2021.12-rc/apache/Dockerfile
@ -73,10 +73,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
--- a/2021.12-rc/fpm-alpine/Dockerfile
+++ b/2021.12-rc/fpm-alpine/Dockerfile
@ -62,10 +62,8 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
--- a/2021.12-rc/fpm/Dockerfile
+++ b/2021.12-rc/fpm/Dockerfile
@ -73,10 +73,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -61,10 +61,8 @@ RUN set -ex; \
    ; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    \
    docker-php-ext-install -j "$(nproc)" \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -72,10 +72,8 @@ RUN set -ex; \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
    \
    docker-php-ext-configure gd \
-        --with-gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ \
+        --with-freetype \
+        --with-jpeg \
    ; \
    docker-php-ext-configure ldap \
        --with-libdir=lib/$debMultiarch/ \