From b9848d9d8d8268b2b766fbd9c93107e173319777 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Mon, 9 Dec 2024 16:28:17 +0100 Subject: [PATCH] Fixed PHP 7.4 image generation --- base/generate_tags.sh | 2 +- base/images/7.4-apache/Dockerfile | 3 +-- base/images/7.4-fpm/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/base/generate_tags.sh b/base/generate_tags.sh index d9e51c21..c17579c8 100755 --- a/base/generate_tags.sh +++ b/base/generate_tags.sh @@ -41,7 +41,7 @@ generate_image() s/{PHP_TAG}/'"${version}"'/ ' Dockerfile.model > images/$folder/Dockerfile - if [[ $version = *"7.1"* || $version = *"7.2"* || $version = *"7.3"* || $version = *"7.4"* ]]; then + if [[ $version = *"7.1"* || $version = *"7.2"* || $version = *"7.3"* ]]; then local before='RUN docker-php-ext-configure gd --with-freetype=\/usr\/include\/ --with-jpeg=\/usr\/include\/ --with-webp=\/usr\/include' local after='# PHP < 7.4 have an old syntax to install GD. See https:\/\/github.com\/docker-library\/php\/issues\/912\nRUN docker-php-ext-configure gd --with-freetype-dir=\/usr\/include\/ --with-jpeg-dir=\/usr\/include\/ --with-webp-dir=\/usr\/include' diff --git a/base/images/7.4-apache/Dockerfile b/base/images/7.4-apache/Dockerfile index 8c6e4024..3f09e559 100644 --- a/base/images/7.4-apache/Dockerfile +++ b/base/images/7.4-apache/Dockerfile @@ -40,8 +40,7 @@ RUN apt-get update \ libonig-dev RUN rm -rf /var/lib/apt/lists/* -# PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912 -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include +RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath RUN docker-php-source extract \ diff --git a/base/images/7.4-fpm/Dockerfile b/base/images/7.4-fpm/Dockerfile index 7ea5a04e..9a7b71b7 100644 --- a/base/images/7.4-fpm/Dockerfile +++ b/base/images/7.4-fpm/Dockerfile @@ -40,8 +40,7 @@ RUN apt-get update \ libonig-dev RUN rm -rf /var/lib/apt/lists/* -# PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912 -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include +RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath RUN docker-php-source extract \