diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 256796c..4421f3f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -24,7 +24,7 @@ RUN set -ex; \ postgresql-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bz2 \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 6a5e030..9ffde24 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -20,7 +20,7 @@ RUN set -ex; \ libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile index 1f59c1f..6a62e10 100644 --- a/php7.2/apache/Dockerfile +++ b/php7.2/apache/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex; \ libpq-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile index a440a03..45eb670 100644 --- a/php7.2/fpm-alpine/Dockerfile +++ b/php7.2/fpm-alpine/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ postgresql-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bz2 \ diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile index ff3e9a5..caec959 100644 --- a/php7.2/fpm/Dockerfile +++ b/php7.2/fpm/Dockerfile @@ -19,7 +19,7 @@ RUN set -ex; \ libpq-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index 34a89d6..e79f988 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index fe1481c..80a51ab 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex; \ postgresql-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bz2 \ diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index d98b135..2473ace 100644 --- a/php7.3/fpm/Dockerfile +++ b/php7.3/fpm/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex; \ libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile index c60b7bf..de6541a 100644 --- a/php7.4/apache/Dockerfile +++ b/php7.4/apache/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile index f928379..6008c11 100644 --- a/php7.4/fpm-alpine/Dockerfile +++ b/php7.4/fpm-alpine/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex; \ postgresql-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bz2 \ diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile index e53540a..37825aa 100644 --- a/php7.4/fpm/Dockerfile +++ b/php7.4/fpm/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex; \ libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/update.sh b/update.sh index 972f1c0..f43daf6 100755 --- a/update.sh +++ b/update.sh @@ -73,6 +73,13 @@ for phpVersion in "${phpVersions[@]}"; do -e '/libzip-dev/d' \ "$dir/Dockerfile" fi + case "$phpVersion" in + 7.2 | 7.3 ) + sed -ri \ + -e 's!gd --with-jpeg!gd --with-jpeg-dir=/usr --with-png-dir=/usr!g' \ + "$dir/Dockerfile" + ;; + esac )