Merge pull request #380 from Quetzacoalt91/fix-configuration-of-gd

Fix configuration of gd in base images below PHP 7.4
PrestaShop · Apr 15, 2024 · e361f0b · e361f0b
2 parents 568ec5c + f1ca9e4
commit e361f0b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/base/images/7.1-apache/Dockerfile b/base/images/7.1-apache/Dockerfile
@@ -40,7 +40,8 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
+# 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-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \

diff --git a/base/images/7.1-fpm/Dockerfile b/base/images/7.1-fpm/Dockerfile
@@ -40,7 +40,8 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
+# 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-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \

diff --git a/base/images/7.2-apache/Dockerfile b/base/images/7.2-apache/Dockerfile
@@ -40,7 +40,8 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
+# 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-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \

diff --git a/base/images/7.2-fpm/Dockerfile b/base/images/7.2-fpm/Dockerfile
@@ -40,7 +40,8 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
+# 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-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \

diff --git a/base/images/7.3-apache/Dockerfile b/base/images/7.3-apache/Dockerfile
@@ -40,7 +40,8 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
+# 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-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \

diff --git a/base/images/7.3-fpm/Dockerfile b/base/images/7.3-fpm/Dockerfile
@@ -40,7 +40,9 @@ RUN apt-get update \
         libonig-dev
 
 RUN rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
+
+# 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-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 
 RUN docker-php-source extract \