Merge pull request #412 from PrestaShop/useNightlyBuild

Fixed PHP 7.4 image generation
PrestaShop · Dec 9, 2024 · 52b92f6 · 52b92f6
2 parents db56ae0 + b9848d9
commit 52b92f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 \