From 0a7d3b46af2632d984f6eab6986c06d219037f4b Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Thu, 12 Sep 2024 09:52:08 +0200 Subject: [PATCH] Run `./apply-template.sh` --- beta/php8.1/apache/Dockerfile | 1 + beta/php8.1/fpm-alpine/Dockerfile | 4 +++- beta/php8.1/fpm/Dockerfile | 1 + beta/php8.2/apache/Dockerfile | 1 + beta/php8.2/fpm-alpine/Dockerfile | 4 +++- beta/php8.2/fpm/Dockerfile | 1 + beta/php8.3/apache/Dockerfile | 1 + beta/php8.3/fpm-alpine/Dockerfile | 4 +++- beta/php8.3/fpm/Dockerfile | 1 + cli/php8.1/alpine/Dockerfile | 4 +++- cli/php8.2/alpine/Dockerfile | 4 +++- cli/php8.3/alpine/Dockerfile | 4 +++- latest/php8.1/apache/Dockerfile | 1 + latest/php8.1/fpm-alpine/Dockerfile | 4 +++- latest/php8.1/fpm/Dockerfile | 1 + latest/php8.2/apache/Dockerfile | 1 + latest/php8.2/fpm-alpine/Dockerfile | 4 +++- latest/php8.2/fpm/Dockerfile | 1 + latest/php8.3/apache/Dockerfile | 1 + latest/php8.3/fpm-alpine/Dockerfile | 4 +++- latest/php8.3/fpm/Dockerfile | 1 + 21 files changed, 39 insertions(+), 9 deletions(-) diff --git a/beta/php8.1/apache/Dockerfile b/beta/php8.1/apache/Dockerfile index 542017d9b7..ad4946b97f 100644 --- a/beta/php8.1/apache/Dockerfile +++ b/beta/php8.1/apache/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.1/fpm-alpine/Dockerfile b/beta/php8.1/fpm-alpine/Dockerfile index 9910492dd2..12d523ba1d 100644 --- a/beta/php8.1/fpm-alpine/Dockerfile +++ b/beta/php8.1/fpm-alpine/Dockerfile @@ -24,7 +24,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.1/fpm/Dockerfile b/beta/php8.1/fpm/Dockerfile index d45d43846a..bbdcf47756 100644 --- a/beta/php8.1/fpm/Dockerfile +++ b/beta/php8.1/fpm/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.2/apache/Dockerfile b/beta/php8.2/apache/Dockerfile index 12bf93dc0c..f936344ccf 100644 --- a/beta/php8.2/apache/Dockerfile +++ b/beta/php8.2/apache/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.2/fpm-alpine/Dockerfile b/beta/php8.2/fpm-alpine/Dockerfile index bf9e53546c..9e8c4093e2 100644 --- a/beta/php8.2/fpm-alpine/Dockerfile +++ b/beta/php8.2/fpm-alpine/Dockerfile @@ -24,7 +24,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.2/fpm/Dockerfile b/beta/php8.2/fpm/Dockerfile index a0e0d6ba60..0e4f5afc17 100644 --- a/beta/php8.2/fpm/Dockerfile +++ b/beta/php8.2/fpm/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.3/apache/Dockerfile b/beta/php8.3/apache/Dockerfile index b42f9a0a7f..08050945da 100644 --- a/beta/php8.3/apache/Dockerfile +++ b/beta/php8.3/apache/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.3/fpm-alpine/Dockerfile b/beta/php8.3/fpm-alpine/Dockerfile index 10c6a1b261..04ba455430 100644 --- a/beta/php8.3/fpm-alpine/Dockerfile +++ b/beta/php8.3/fpm-alpine/Dockerfile @@ -24,7 +24,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.3/fpm/Dockerfile b/beta/php8.3/fpm/Dockerfile index 05d32c609c..df5636c703 100644 --- a/beta/php8.3/fpm/Dockerfile +++ b/beta/php8.3/fpm/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/cli/php8.1/alpine/Dockerfile b/cli/php8.1/alpine/Dockerfile index 6b8569732a..ee49be32f8 100644 --- a/cli/php8.1/alpine/Dockerfile +++ b/cli/php8.1/alpine/Dockerfile @@ -25,7 +25,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -33,6 +34,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/cli/php8.2/alpine/Dockerfile b/cli/php8.2/alpine/Dockerfile index a02e5f976d..1bd85cfb68 100644 --- a/cli/php8.2/alpine/Dockerfile +++ b/cli/php8.2/alpine/Dockerfile @@ -25,7 +25,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -33,6 +34,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/cli/php8.3/alpine/Dockerfile b/cli/php8.3/alpine/Dockerfile index e9e7d307be..d5df8ea6d6 100644 --- a/cli/php8.3/alpine/Dockerfile +++ b/cli/php8.3/alpine/Dockerfile @@ -25,7 +25,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -33,6 +34,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.1/apache/Dockerfile b/latest/php8.1/apache/Dockerfile index 542017d9b7..ad4946b97f 100644 --- a/latest/php8.1/apache/Dockerfile +++ b/latest/php8.1/apache/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.1/fpm-alpine/Dockerfile b/latest/php8.1/fpm-alpine/Dockerfile index 9910492dd2..12d523ba1d 100644 --- a/latest/php8.1/fpm-alpine/Dockerfile +++ b/latest/php8.1/fpm-alpine/Dockerfile @@ -24,7 +24,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.1/fpm/Dockerfile b/latest/php8.1/fpm/Dockerfile index d45d43846a..bbdcf47756 100644 --- a/latest/php8.1/fpm/Dockerfile +++ b/latest/php8.1/fpm/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.2/apache/Dockerfile b/latest/php8.2/apache/Dockerfile index 12bf93dc0c..f936344ccf 100644 --- a/latest/php8.2/apache/Dockerfile +++ b/latest/php8.2/apache/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.2/fpm-alpine/Dockerfile b/latest/php8.2/fpm-alpine/Dockerfile index bf9e53546c..9e8c4093e2 100644 --- a/latest/php8.2/fpm-alpine/Dockerfile +++ b/latest/php8.2/fpm-alpine/Dockerfile @@ -24,7 +24,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.2/fpm/Dockerfile b/latest/php8.2/fpm/Dockerfile index a0e0d6ba60..0e4f5afc17 100644 --- a/latest/php8.2/fpm/Dockerfile +++ b/latest/php8.2/fpm/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.3/apache/Dockerfile b/latest/php8.3/apache/Dockerfile index b42f9a0a7f..08050945da 100644 --- a/latest/php8.3/apache/Dockerfile +++ b/latest/php8.3/apache/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.3/fpm-alpine/Dockerfile b/latest/php8.3/fpm-alpine/Dockerfile index 10c6a1b261..04ba455430 100644 --- a/latest/php8.3/fpm-alpine/Dockerfile +++ b/latest/php8.3/fpm-alpine/Dockerfile @@ -24,7 +24,8 @@ RUN set -ex; \ $PHPIZE_DEPS \ freetype-dev \ icu-dev \ - imagemagick-dev \ + imagemagick-dev libheif-dev \ + libavif-dev \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/latest/php8.3/fpm/Dockerfile b/latest/php8.3/fpm/Dockerfile index 05d32c609c..df5636c703 100644 --- a/latest/php8.3/fpm/Dockerfile +++ b/latest/php8.3/fpm/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \