From 760cf75e3afda5ffea978186dc9278983a80422e Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 5 Jan 2022 12:00:22 +0100 Subject: [PATCH] Fix PHP GD configuration (see https://github.com/docker-library/php/issues/912#issuecomment-559918036 for details) --- 2021.09/apache/Dockerfile | 6 ++---- 2021.09/fpm-alpine/Dockerfile | 6 ++---- 2021.09/fpm/Dockerfile | 6 ++---- 2021.12-dev/apache/Dockerfile | 6 ++---- 2021.12-dev/fpm-alpine/Dockerfile | 6 ++---- 2021.12-dev/fpm/Dockerfile | 6 ++---- 2021.12-rc/apache/Dockerfile | 6 ++---- 2021.12-rc/fpm-alpine/Dockerfile | 6 ++---- 2021.12-rc/fpm/Dockerfile | 6 ++---- Dockerfile-alpine.template | 6 ++---- Dockerfile-debian.template | 6 ++---- 11 files changed, 22 insertions(+), 44 deletions(-) diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index 0921782..745176f 100644 --- 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/ \ diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index 32415c9..7ff6a18 100644 --- 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)" \ diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index 5ea3443..771d189 100644 --- 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/ \ diff --git a/2021.12-dev/apache/Dockerfile b/2021.12-dev/apache/Dockerfile index dfa469f..113f112 100644 --- 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/ \ diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2021.12-dev/fpm-alpine/Dockerfile index be4320d..e8726fe 100644 --- 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)" \ diff --git a/2021.12-dev/fpm/Dockerfile b/2021.12-dev/fpm/Dockerfile index 6b7c15c..f53250f 100644 --- 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/ \ diff --git a/2021.12-rc/apache/Dockerfile b/2021.12-rc/apache/Dockerfile index ec60441..2a315eb 100644 --- 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/ \ diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2021.12-rc/fpm-alpine/Dockerfile index d46840f..3fac4f5 100644 --- 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)" \ diff --git a/2021.12-rc/fpm/Dockerfile b/2021.12-rc/fpm/Dockerfile index 2a33bba..317c667 100644 --- 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/ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 380c701..8fb421b 100644 --- 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)" \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index ce3abf4..c9bfe36 100644 --- 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/ \