From aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f Mon Sep 17 00:00:00 2001 From: Mukesh Panchal Date: Wed, 11 Sep 2024 09:42:25 +0530 Subject: [PATCH] Install missing packages for AVIF support Co-authored-by: Pascal Birchler --- Dockerfile.template | 5 ++++- beta/php8.1/apache/Dockerfile | 2 ++ beta/php8.1/fpm-alpine/Dockerfile | 4 +++- beta/php8.1/fpm/Dockerfile | 2 ++ beta/php8.2/apache/Dockerfile | 2 ++ beta/php8.2/fpm-alpine/Dockerfile | 4 +++- beta/php8.2/fpm/Dockerfile | 2 ++ beta/php8.3/apache/Dockerfile | 2 ++ beta/php8.3/fpm-alpine/Dockerfile | 4 +++- beta/php8.3/fpm/Dockerfile | 2 ++ cli/php8.1/alpine/Dockerfile | 4 +++- cli/php8.2/alpine/Dockerfile | 4 +++- cli/php8.3/alpine/Dockerfile | 4 +++- latest/php8.1/apache/Dockerfile | 2 ++ latest/php8.1/fpm-alpine/Dockerfile | 4 +++- latest/php8.1/fpm/Dockerfile | 2 ++ latest/php8.2/apache/Dockerfile | 2 ++ latest/php8.2/fpm-alpine/Dockerfile | 4 +++- latest/php8.2/fpm/Dockerfile | 2 ++ latest/php8.3/apache/Dockerfile | 2 ++ latest/php8.3/fpm-alpine/Dockerfile | 4 +++- latest/php8.3/fpm/Dockerfile | 2 ++ 22 files changed, 55 insertions(+), 10 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 846f7962e3..017f0ed466 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -47,7 +47,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 \ @@ -58,6 +59,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -69,6 +71,7 @@ RUN set -ex; \ {{ ) end -}} \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \ diff --git a/beta/php8.1/apache/Dockerfile b/beta/php8.1/apache/Dockerfile index 542017d9b7..eb513e4e24 100644 --- a/beta/php8.1/apache/Dockerfile +++ b/beta/php8.1/apache/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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-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..03d44e48cd 100644 --- a/beta/php8.1/fpm/Dockerfile +++ b/beta/php8.1/fpm/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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/apache/Dockerfile b/beta/php8.2/apache/Dockerfile index 12bf93dc0c..a67efd71dd 100644 --- a/beta/php8.2/apache/Dockerfile +++ b/beta/php8.2/apache/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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-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..f3a9d06543 100644 --- a/beta/php8.2/fpm/Dockerfile +++ b/beta/php8.2/fpm/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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/apache/Dockerfile b/beta/php8.3/apache/Dockerfile index b42f9a0a7f..aa2c758199 100644 --- a/beta/php8.3/apache/Dockerfile +++ b/beta/php8.3/apache/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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-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..df8fa2ba17 100644 --- a/beta/php8.3/fpm/Dockerfile +++ b/beta/php8.3/fpm/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -32,6 +33,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..eb513e4e24 100644 --- a/latest/php8.1/apache/Dockerfile +++ b/latest/php8.1/apache/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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-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..03d44e48cd 100644 --- a/latest/php8.1/fpm/Dockerfile +++ b/latest/php8.1/fpm/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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/apache/Dockerfile b/latest/php8.2/apache/Dockerfile index 12bf93dc0c..a67efd71dd 100644 --- a/latest/php8.2/apache/Dockerfile +++ b/latest/php8.2/apache/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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-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..f3a9d06543 100644 --- a/latest/php8.2/fpm/Dockerfile +++ b/latest/php8.2/fpm/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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/apache/Dockerfile b/latest/php8.3/apache/Dockerfile index b42f9a0a7f..aa2c758199 100644 --- a/latest/php8.3/apache/Dockerfile +++ b/latest/php8.3/apache/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-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-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..df8fa2ba17 100644 --- a/latest/php8.3/fpm/Dockerfile +++ b/latest/php8.3/fpm/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + libavif-dev \ libfreetype6-dev \ libicu-dev \ libjpeg-dev \ @@ -32,6 +33,7 @@ RUN set -ex; \ ; \ \ docker-php-ext-configure gd \ + --with-avif \ --with-freetype \ --with-jpeg \ --with-webp \