From 97b4160f31a0d6f134b8a19542566fd0a1434677 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 4 Jan 2022 21:43:29 +0100 Subject: [PATCH 1/3] Update PHP version --- 2021.09/apache/Dockerfile | 4 ++-- 2021.09/fpm-alpine/Dockerfile | 4 ++-- 2021.09/fpm/Dockerfile | 4 ++-- 2021.12-dev/apache/Dockerfile | 4 ++-- 2021.12-dev/fpm-alpine/Dockerfile | 4 ++-- 2021.12-dev/fpm/Dockerfile | 4 ++-- 2021.12-rc/apache/Dockerfile | 4 ++-- 2021.12-rc/fpm-alpine/Dockerfile | 4 ++-- 2021.12-rc/fpm/Dockerfile | 4 ++-- Dockerfile-debian.template | 2 +- update.sh | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index f5684d7..0921782 100644 --- a/2021.09/apache/Dockerfile +++ b/2021.09/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.3-apache-buster +FROM php:7.4-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -94,7 +94,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install apcu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index 0b6b66a..32415c9 100644 --- a/2021.09/fpm-alpine/Dockerfile +++ b/2021.09/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.3-fpm-alpine +FROM php:7.4-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -80,7 +80,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index 1348f34..5ea3443 100644 --- a/2021.09/fpm/Dockerfile +++ b/2021.09/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.3-fpm-buster +FROM php:7.4-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -94,7 +94,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install apcu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.12-dev/apache/Dockerfile b/2021.12-dev/apache/Dockerfile index ff7745c..dfa469f 100644 --- a/2021.12-dev/apache/Dockerfile +++ b/2021.12-dev/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.3-apache-buster +FROM php:7.4-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -94,7 +94,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install apcu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2021.12-dev/fpm-alpine/Dockerfile index d9b0c5e..be4320d 100644 --- a/2021.12-dev/fpm-alpine/Dockerfile +++ b/2021.12-dev/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.3-fpm-alpine +FROM php:7.4-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -80,7 +80,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.12-dev/fpm/Dockerfile b/2021.12-dev/fpm/Dockerfile index cff1cd6..6b7c15c 100644 --- a/2021.12-dev/fpm/Dockerfile +++ b/2021.12-dev/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.3-fpm-buster +FROM php:7.4-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -94,7 +94,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install apcu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.12-rc/apache/Dockerfile b/2021.12-rc/apache/Dockerfile index eddee0f..ec60441 100644 --- a/2021.12-rc/apache/Dockerfile +++ b/2021.12-rc/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.3-apache-buster +FROM php:7.4-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -94,7 +94,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install apcu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2021.12-rc/fpm-alpine/Dockerfile index a2f0cbb..d46840f 100644 --- a/2021.12-rc/fpm-alpine/Dockerfile +++ b/2021.12-rc/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.3-fpm-alpine +FROM php:7.4-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -80,7 +80,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/2021.12-rc/fpm/Dockerfile b/2021.12-rc/fpm/Dockerfile index bfcd7a0..2a33bba 100644 --- a/2021.12-rc/fpm/Dockerfile +++ b/2021.12-rc/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.3-fpm-buster +FROM php:7.4-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -94,7 +94,7 @@ RUN set -ex; \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install apcu-5.1.21; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.5; \ pecl install imagick-3.5.1; \ \ docker-php-ext-enable \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index c5982b7..ce3abf4 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM php:%%PHP_VERSION%%-%%VARIANT%%-buster +FROM php:%%PHP_VERSION%%-%%VARIANT%%-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index 831c4b2..87f803a 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ set -eo pipefail declare -A php_version=( - [default]='7.3' + [default]='7.4' ) declare -A cmd=( From 760cf75e3afda5ffea978186dc9278983a80422e Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 5 Jan 2022 12:00:22 +0100 Subject: [PATCH 2/3] Fix PHP GD configuration (see https://github.com/docker-library/php/issues/912#issuecomment-559918036 for details) --- 2021.09/apache/Dockerfile | 6 ++---- 2021.09/fpm-alpine/Dockerfile | 6 ++---- 2021.09/fpm/Dockerfile | 6 ++---- 2021.12-dev/apache/Dockerfile | 6 ++---- 2021.12-dev/fpm-alpine/Dockerfile | 6 ++---- 2021.12-dev/fpm/Dockerfile | 6 ++---- 2021.12-rc/apache/Dockerfile | 6 ++---- 2021.12-rc/fpm-alpine/Dockerfile | 6 ++---- 2021.12-rc/fpm/Dockerfile | 6 ++---- Dockerfile-alpine.template | 6 ++---- Dockerfile-debian.template | 6 ++---- 11 files changed, 22 insertions(+), 44 deletions(-) diff --git a/2021.09/apache/Dockerfile b/2021.09/apache/Dockerfile index 0921782..745176f 100644 --- a/2021.09/apache/Dockerfile +++ b/2021.09/apache/Dockerfile @@ -73,10 +73,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ diff --git a/2021.09/fpm-alpine/Dockerfile b/2021.09/fpm-alpine/Dockerfile index 32415c9..7ff6a18 100644 --- a/2021.09/fpm-alpine/Dockerfile +++ b/2021.09/fpm-alpine/Dockerfile @@ -62,10 +62,8 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/2021.09/fpm/Dockerfile b/2021.09/fpm/Dockerfile index 5ea3443..771d189 100644 --- a/2021.09/fpm/Dockerfile +++ b/2021.09/fpm/Dockerfile @@ -73,10 +73,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ diff --git a/2021.12-dev/apache/Dockerfile b/2021.12-dev/apache/Dockerfile index dfa469f..113f112 100644 --- a/2021.12-dev/apache/Dockerfile +++ b/2021.12-dev/apache/Dockerfile @@ -73,10 +73,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ diff --git a/2021.12-dev/fpm-alpine/Dockerfile b/2021.12-dev/fpm-alpine/Dockerfile index be4320d..e8726fe 100644 --- a/2021.12-dev/fpm-alpine/Dockerfile +++ b/2021.12-dev/fpm-alpine/Dockerfile @@ -62,10 +62,8 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/2021.12-dev/fpm/Dockerfile b/2021.12-dev/fpm/Dockerfile index 6b7c15c..f53250f 100644 --- a/2021.12-dev/fpm/Dockerfile +++ b/2021.12-dev/fpm/Dockerfile @@ -73,10 +73,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ diff --git a/2021.12-rc/apache/Dockerfile b/2021.12-rc/apache/Dockerfile index ec60441..2a315eb 100644 --- a/2021.12-rc/apache/Dockerfile +++ b/2021.12-rc/apache/Dockerfile @@ -73,10 +73,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ diff --git a/2021.12-rc/fpm-alpine/Dockerfile b/2021.12-rc/fpm-alpine/Dockerfile index d46840f..3fac4f5 100644 --- a/2021.12-rc/fpm-alpine/Dockerfile +++ b/2021.12-rc/fpm-alpine/Dockerfile @@ -62,10 +62,8 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/2021.12-rc/fpm/Dockerfile b/2021.12-rc/fpm/Dockerfile index 2a33bba..317c667 100644 --- a/2021.12-rc/fpm/Dockerfile +++ b/2021.12-rc/fpm/Dockerfile @@ -73,10 +73,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 380c701..8fb421b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -61,10 +61,8 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ \ docker-php-ext-install -j "$(nproc)" \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index ce3abf4..c9bfe36 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -72,10 +72,8 @@ RUN set -ex; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ \ docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ ; \ docker-php-ext-configure ldap \ --with-libdir=lib/$debMultiarch/ \ From a562de0ba4696777b54b6254a0d64c100cf6ccee Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 5 Jan 2022 12:14:57 +0100 Subject: [PATCH 3/3] 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 \