From 11cc51e60a74f75e527abf6d8bb609c79ab82a58 Mon Sep 17 00:00:00 2001 From: Flow86 <656249+Flow86@users.noreply.github.com> Date: Wed, 26 Jun 2019 14:44:44 +0200 Subject: [PATCH] Enable WEBP support in PHP's gd in debian and alpine containers Signed-off-by: Flow86 <656249+Flow86@users.noreply.github.com> --- 14.0/apache/Dockerfile | 3 ++- 14.0/fpm-alpine/Dockerfile | 3 ++- 14.0/fpm/Dockerfile | 3 ++- 15.0/apache/Dockerfile | 3 ++- 15.0/fpm-alpine/Dockerfile | 3 ++- 15.0/fpm/Dockerfile | 3 ++- 16.0/apache/Dockerfile | 3 ++- 16.0/fpm-alpine/Dockerfile | 3 ++- 16.0/fpm/Dockerfile | 3 ++- Dockerfile-alpine.template | 3 ++- Dockerfile-debian.template | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index 7761acd09..88cc44873 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -35,10 +35,11 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \ diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile index 99c21e1c2..5d6c52118 100644 --- a/14.0/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -30,9 +30,10 @@ RUN set -ex; \ pcre-dev \ postgresql-dev \ imagemagick-dev \ + libwebp-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap; \ docker-php-ext-install \ exif \ diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index 3122f0feb..919b02587 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -35,10 +35,11 @@ RUN set -ex; \ libpq-dev \ libxml2-dev \ libmagickwand-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \ diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index fc56e8556..88a696546 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -36,10 +36,11 @@ RUN set -ex; \ libxml2-dev \ libmagickwand-dev \ libzip-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \ diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile index f3209d2ea..6163bb24f 100644 --- a/15.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -31,9 +31,10 @@ RUN set -ex; \ pcre-dev \ postgresql-dev \ imagemagick-dev \ + libwebp-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap; \ docker-php-ext-install \ exif \ diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index 9bfd04604..9509fb2d4 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -36,10 +36,11 @@ RUN set -ex; \ libxml2-dev \ libmagickwand-dev \ libzip-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \ diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile index 673fb95fd..47d5de4dc 100644 --- a/16.0/apache/Dockerfile +++ b/16.0/apache/Dockerfile @@ -36,10 +36,11 @@ RUN set -ex; \ libxml2-dev \ libmagickwand-dev \ libzip-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \ diff --git a/16.0/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile index 368168171..07a5103b9 100644 --- a/16.0/fpm-alpine/Dockerfile +++ b/16.0/fpm-alpine/Dockerfile @@ -31,9 +31,10 @@ RUN set -ex; \ pcre-dev \ postgresql-dev \ imagemagick-dev \ + libwebp-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap; \ docker-php-ext-install \ exif \ diff --git a/16.0/fpm/Dockerfile b/16.0/fpm/Dockerfile index 2d960bdbd..031077281 100644 --- a/16.0/fpm/Dockerfile +++ b/16.0/fpm/Dockerfile @@ -36,10 +36,11 @@ RUN set -ex; \ libxml2-dev \ libmagickwand-dev \ libzip-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 70007d07c..8547214eb 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -30,9 +30,10 @@ RUN set -ex; \ pcre-dev \ postgresql-dev \ imagemagick-dev \ + libwebp-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap; \ docker-php-ext-install \ exif \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 3c955de62..6c8b78ad9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -35,10 +35,11 @@ RUN set -ex; \ libxml2-dev \ libmagickwand-dev \ libzip-dev \ + libwebp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \ + docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install \ exif \