[FIX] gd config for official php images

leroyshirto · Dec 17, 2019 · 091c458 · 091c458
1 parent 7a8107e
commit 091c458
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 10 deletions.
diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile
@@ -128,6 +128,7 @@ RUN set -x \
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -154,7 +155,7 @@ RUN set -x \
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -210,6 +211,7 @@ RUN set -x \
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \

diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile
@@ -128,6 +128,7 @@ RUN set -x \
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -154,7 +155,7 @@ RUN set -x \
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -215,6 +216,7 @@ RUN set -x \
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \

diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile
@@ -128,6 +128,7 @@ RUN set -x \
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -154,7 +155,7 @@ RUN set -x \
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -215,6 +216,7 @@ RUN set -x \
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \

diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile
@@ -128,6 +128,7 @@ RUN set -x \
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -154,7 +155,7 @@ RUN set -x \
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -214,6 +215,7 @@ RUN set -x \
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \

diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile
@@ -27,7 +27,7 @@ RUN mkdir -p \
     && "/baselayout/sbin/gosu" nobody true
 
 
-FROM php:7.3-fpm-stretch
+FROM php:7.3-fpm-buster
 
 LABEL [email protected] \
       vendor=WebDevOps.io \
@@ -128,6 +128,7 @@ RUN set -x \
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -154,7 +155,7 @@ RUN set -x \
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -218,6 +219,7 @@ RUN set -x \
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \

diff --git a/docker/php-official/7.3/Dockerfile.jinja2 b/docker/php-official/7.3/Dockerfile.jinja2
@@ -1,6 +1,6 @@
 {{ baselayout.dockerStage() }}
 
-{{ docker.fromOfficial("php", "7.3-fpm-stretch") }}
+{{ docker.fromOfficial("php", "7.3-fpm-buster") }}
 
 {{ docker.version() }}
 
@@ -14,7 +14,7 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ bootstrap.debian('stretch') }}
+    {{ bootstrap.debian('buster') }}
 
 RUN set -x \
     {{ base.debian() }} \

diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile
@@ -128,6 +128,7 @@ RUN set -x \
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -154,7 +155,7 @@ RUN set -x \
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -217,6 +218,7 @@ RUN set -x \
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -29,6 +29,7 @@
         libzip4 \
         # Dev and headers
         libjpeg62-turbo-dev \
+        libwebp-dev \
         libfreetype6-dev \
         libbz2-dev \
         libicu-dev \
@@ -55,7 +56,11 @@
     && cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
     && rm -rf master.zip guetzli-master \
     # Install extensions
-    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+{%- if version != '7.4' %}
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
+{%- else %}
+    && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
+{%- endif %}
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
@@ -143,6 +148,7 @@
         libxslt1-dev \
         zlib1g-dev \
         libpng-dev \
+        libwebp-dev \
         libpq-dev \
         libzip-dev \
         libvips-dev \