From a562de0ba4696777b54b6254a0d64c100cf6ccee Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 5 Jan 2022 12:14:57 +0100 Subject: [PATCH] Add exif & webp support --- 2021.09/apache/Dockerfile | 3 +++ 2021.09/fpm-alpine/Dockerfile | 3 +++ 2021.09/fpm/Dockerfile | 3 +++ 2021.12-dev/apache/Dockerfile | 3 +++ 2021.12-dev/fpm-alpine/Dockerfile | 3 +++ 2021.12-dev/fpm/Dockerfile | 3 +++ 2021.12-rc/apache/Dockerfile | 3 +++ 2021.12-rc/fpm-alpine/Dockerfile | 3 +++ 2021.12-rc/fpm/Dockerfile | 3 +++ Dockerfile-alpine.template | 3 +++ Dockerfile-debian.template | 3 +++ 11 files changed, 33 insertions(+) diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index 745176f..51845a7 100644 --- a/2021.09/apache/Dockerfile +++ b/2021.09/apache/Dockerfile @@ -65,6 +65,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -75,6 +76,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -82,6 +84,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \ diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index 7ff6a18..38bb081 100644 --- a/2021.09/fpm-alpine/Dockerfile +++ b/2021.09/fpm-alpine/Dockerfile @@ -54,6 +54,7 @@ RUN set -ex; \ cyrus-sasl-dev \ libjpeg-turbo-dev \ freetype-dev \ + libwebp-dev \ librsvg \ pcre-dev \ libzip-dev \ @@ -64,10 +65,12 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ + exif \ gd \ zip \ opcache \ diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index 771d189..2fba160 100644 --- a/2021.09/fpm/Dockerfile +++ b/2021.09/fpm/Dockerfile @@ -65,6 +65,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -75,6 +76,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -82,6 +84,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \ diff --git a/2021.12-dev/apache/Dockerfile b/2021.12-dev/apache/Dockerfile index 113f112..0a0a2be 100644 --- a/2021.12-dev/apache/Dockerfile +++ b/2021.12-dev/apache/Dockerfile @@ -65,6 +65,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -75,6 +76,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -82,6 +84,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \ diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2021.12-dev/fpm-alpine/Dockerfile index e8726fe..9bc61b4 100644 --- a/2021.12-dev/fpm-alpine/Dockerfile +++ b/2021.12-dev/fpm-alpine/Dockerfile @@ -54,6 +54,7 @@ RUN set -ex; \ cyrus-sasl-dev \ libjpeg-turbo-dev \ freetype-dev \ + libwebp-dev \ librsvg \ pcre-dev \ libzip-dev \ @@ -64,10 +65,12 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ + exif \ gd \ zip \ opcache \ diff --git a/2021.12-dev/fpm/Dockerfile b/2021.12-dev/fpm/Dockerfile index f53250f..d0fcb5f 100644 --- a/2021.12-dev/fpm/Dockerfile +++ b/2021.12-dev/fpm/Dockerfile @@ -65,6 +65,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -75,6 +76,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -82,6 +84,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \ diff --git a/2021.12-rc/apache/Dockerfile b/2021.12-rc/apache/Dockerfile index 2a315eb..aeeae37 100644 --- a/2021.12-rc/apache/Dockerfile +++ b/2021.12-rc/apache/Dockerfile @@ -65,6 +65,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -75,6 +76,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -82,6 +84,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \ diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2021.12-rc/fpm-alpine/Dockerfile index 3fac4f5..a12850c 100644 --- a/2021.12-rc/fpm-alpine/Dockerfile +++ b/2021.12-rc/fpm-alpine/Dockerfile @@ -54,6 +54,7 @@ RUN set -ex; \ cyrus-sasl-dev \ libjpeg-turbo-dev \ freetype-dev \ + libwebp-dev \ librsvg \ pcre-dev \ libzip-dev \ @@ -64,10 +65,12 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ + exif \ gd \ zip \ opcache \ diff --git a/2021.12-rc/fpm/Dockerfile b/2021.12-rc/fpm/Dockerfile index 317c667..7a1e6be 100644 --- a/2021.12-rc/fpm/Dockerfile +++ b/2021.12-rc/fpm/Dockerfile @@ -65,6 +65,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -75,6 +76,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -82,6 +84,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8fb421b..84665aa 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -53,6 +53,7 @@ RUN set -ex; \ cyrus-sasl-dev \ libjpeg-turbo-dev \ freetype-dev \ + libwebp-dev \ librsvg \ pcre-dev \ libzip-dev \ @@ -63,10 +64,12 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ + exif \ gd \ zip \ opcache \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index c9bfe36..375cc3e 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -64,6 +64,7 @@ RUN set -ex; \ libmemcached-dev \ libgraphicsmagick1-dev \ libfreetype6-dev \ + libwebp-dev \ librsvg2-2 \ libzip-dev \ libldap2-dev \ @@ -74,6 +75,7 @@ RUN set -ex; \ docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ + --with-webp \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ @@ -81,6 +83,7 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ + exif \ zip \ opcache \ ctype \