summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlow86 <656249+Flow86@users.noreply.github.com>2019-06-27 14:01:35 +0200
committerJ0WI <J0WI@users.noreply.github.com>2019-06-27 14:01:35 +0200
commitf5665e148271b97d28d5b91bff3baf5427ec8126 (patch)
tree9813d9cea72ae190fbc275103c6ed70f532964b8
parent3f40b69c54460f565600da9dce0f04cf160ee54a (diff)
Enable WEBP support in PHP's gd in debian and alpine containers (#785)
Signed-off-by: Flow86 <656249+Flow86@users.noreply.github.com>
-rw-r--r--14.0/apache/Dockerfile3
-rw-r--r--14.0/fpm-alpine/Dockerfile3
-rw-r--r--14.0/fpm/Dockerfile3
-rw-r--r--15.0/apache/Dockerfile3
-rw-r--r--15.0/fpm-alpine/Dockerfile3
-rw-r--r--15.0/fpm/Dockerfile3
-rw-r--r--16.0/apache/Dockerfile3
-rw-r--r--16.0/fpm-alpine/Dockerfile3
-rw-r--r--16.0/fpm/Dockerfile3
-rw-r--r--Dockerfile-alpine.template3
-rw-r--r--Dockerfile-debian.template3
11 files changed, 22 insertions, 11 deletions
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index 7761acd0..88cc4487 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 99c21e1c..5d6c5211 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 3122f0fe..919b0258 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 fc56e855..88a69654 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 f3209d2e..6163bb24 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 9bfd0460..9509fb2d 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 673fb95f..47d5de4d 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 36816817..07a5103b 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 2d960bdb..03107728 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 70007d07..8547214e 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 3c955de6..6c8b78ad 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 \