From 1cf4d9843fb99cada3a892f6635fc25556e608b1 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Thu, 11 Sep 2025 15:25:36 -0400 Subject: [PATCH 01/10] Properly flag AVIF support in GD. --- images/5.3/php/Dockerfile | 2 +- images/5.4/php/Dockerfile | 2 +- images/5.5/php/Dockerfile | 2 +- images/5.6.20/php/Dockerfile | 2 +- images/5.6/php/Dockerfile | 2 +- images/7.0/php/Dockerfile | 2 +- images/7.1/php/Dockerfile | 2 +- images/7.2/php/Dockerfile | 2 +- images/7.3/php/Dockerfile | 2 +- images/8.1/php/Dockerfile | 2 +- images/8.2/php/Dockerfile | 2 +- images/8.3/php/Dockerfile | 2 +- images/8.4/php/Dockerfile | 2 +- images/8.5/php/Dockerfile | 2 +- update.php | 28 ++++++++++++++++++++++++++-- 15 files changed, 40 insertions(+), 16 deletions(-) diff --git a/images/5.3/php/Dockerfile b/images/5.3/php/Dockerfile index c66123c..7a843ee 100644 --- a/images/5.3/php/Dockerfile +++ b/images/5.3/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.4/php/Dockerfile b/images/5.4/php/Dockerfile index b751ec9..3e1c8eb 100644 --- a/images/5.4/php/Dockerfile +++ b/images/5.4/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.5/php/Dockerfile b/images/5.5/php/Dockerfile index c89b57a..a7ad854 100644 --- a/images/5.5/php/Dockerfile +++ b/images/5.5/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.6.20/php/Dockerfile b/images/5.6.20/php/Dockerfile index 69731a7..755b8e0 100644 --- a/images/5.6.20/php/Dockerfile +++ b/images/5.6.20/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.6/php/Dockerfile b/images/5.6/php/Dockerfile index aa5f535..306ac09 100644 --- a/images/5.6/php/Dockerfile +++ b/images/5.6/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/7.0/php/Dockerfile b/images/7.0/php/Dockerfile index 030c59d..b1840ea 100644 --- a/images/7.0/php/Dockerfile +++ b/images/7.0/php/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/7.1/php/Dockerfile b/images/7.1/php/Dockerfile index affe642..17abf86 100644 --- a/images/7.1/php/Dockerfile +++ b/images/7.1/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/7.2/php/Dockerfile b/images/7.2/php/Dockerfile index 4d7856c..2796730 100644 --- a/images/7.2/php/Dockerfile +++ b/images/7.2/php/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/7.3/php/Dockerfile b/images/7.3/php/Dockerfile index 73d6dfa..453842b 100644 --- a/images/7.3/php/Dockerfile +++ b/images/7.3/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index 3c2d793..95cd3c4 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index 162a054..e5b2814 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile index ae65d49..68bb1e4 100644 --- a/images/8.3/php/Dockerfile +++ b/images/8.3/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index af104fc..9cb816c 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile index e12762f..82167cc 100644 --- a/images/8.5/php/Dockerfile +++ b/images/8.5/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd mysqli zip exif intl mbstring; \ \ diff --git a/update.php b/update.php index 09b0128..85b0b31 100644 --- a/update.php +++ b/update.php @@ -429,11 +429,35 @@ if ( in_array( 'gd', $config['extensions'], true ) ) { $install_extensions .= " \\\n\t\\\n\t"; + $gd_options = array(); + + if ( version_compare( $version, '7.4' ) >= 0 ) { - $install_extensions .= "docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr;"; + $gd_options = array_merge( + array( + '--enable-gd', + '--with-jpeg=/usr', + '--with-webp=/usr', + ), + $gd_options + ); } else { - $install_extensions .= "docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr;"; + $gd_options = array_merge( + array( + '--with-gd', + '--with-jpeg-dir=/usr', + '-with-png-dir=/usr', + '--with-webp-dir=/usr', + ), + $gd_options + ); } + + if ( version_compare( $version, '8.1' ) >= 0 ) { + $gd_options[] = '--with-avif=/usr'; + } + + $install_extensions .= 'docker-php-ext-configure gd ' . implode( ' ', $gd_options ) . ';'; } if ( $config['extensions'] ) { From 87f042e80c5c97567b97a321659fc203ce5a37df Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Thu, 11 Sep 2025 15:30:40 -0400 Subject: [PATCH 02/10] Add missing library for AVIF --- images/8.1/php/Dockerfile | 2 +- images/8.2/php/Dockerfile | 2 +- images/8.3/php/Dockerfile | 2 +- images/8.4/php/Dockerfile | 2 +- images/8.5/php/Dockerfile | 2 +- update.php | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index 95cd3c4..ad716c1 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index e5b2814..e9224e4 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile index 68bb1e4..205b2b3 100644 --- a/images/8.3/php/Dockerfile +++ b/images/8.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index 9cb816c..6cb3b58 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile index 82167cc..5454ba8 100644 --- a/images/8.5/php/Dockerfile +++ b/images/8.5/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/update.php b/update.php index 85b0b31..340c914 100644 --- a/update.php +++ b/update.php @@ -86,7 +86,7 @@ '8.1' => array( 'php' => array( 'base_name' => 'php:8.1-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -100,7 +100,7 @@ '8.2' => array( 'php' => array( 'base_name' => 'php:8.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -114,7 +114,7 @@ '8.3' => array( 'php' => array( 'base_name' => 'php:8.3-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -128,7 +128,7 @@ '8.4' => array( 'php' => array( 'base_name' => 'php:8.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -142,7 +142,7 @@ '8.5' => array( 'php' => array( 'base_name' => 'php:8.5-rc-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array(), 'composer' => true, From 5f4879e5276af571979705d14fc3248c1a8fe40d Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Sat, 13 Sep 2025 06:40:08 -0400 Subject: [PATCH 03/10] Undo changes to legacy containers --- images/5.3/php/Dockerfile | 2 +- images/5.4/php/Dockerfile | 2 +- images/5.5/php/Dockerfile | 2 +- images/5.6.20/php/Dockerfile | 2 +- images/5.6/php/Dockerfile | 2 +- images/7.0/php/Dockerfile | 2 +- images/7.1/php/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/5.3/php/Dockerfile b/images/5.3/php/Dockerfile index 7a843ee..c66123c 100644 --- a/images/5.3/php/Dockerfile +++ b/images/5.3/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.4/php/Dockerfile b/images/5.4/php/Dockerfile index 3e1c8eb..b751ec9 100644 --- a/images/5.4/php/Dockerfile +++ b/images/5.4/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.5/php/Dockerfile b/images/5.5/php/Dockerfile index a7ad854..c89b57a 100644 --- a/images/5.5/php/Dockerfile +++ b/images/5.5/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.6.20/php/Dockerfile b/images/5.6.20/php/Dockerfile index 755b8e0..69731a7 100644 --- a/images/5.6.20/php/Dockerfile +++ b/images/5.6.20/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/5.6/php/Dockerfile b/images/5.6/php/Dockerfile index 306ac09..aa5f535 100644 --- a/images/5.6/php/Dockerfile +++ b/images/5.6/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd mysql mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/7.0/php/Dockerfile b/images/7.0/php/Dockerfile index b1840ea..030c59d 100644 --- a/images/7.0/php/Dockerfile +++ b/images/7.0/php/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/7.1/php/Dockerfile b/images/7.1/php/Dockerfile index 17abf86..affe642 100644 --- a/images/7.1/php/Dockerfile +++ b/images/7.1/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ From 7627e2255f672d36f45b4a01da9316e21580c126 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 15 Sep 2025 21:55:54 -0400 Subject: [PATCH 04/10] Add the `libheif` library. --- images/7.2/php/Dockerfile | 2 +- images/7.3/php/Dockerfile | 2 +- images/7.4/php/Dockerfile | 2 +- images/8.0/php/Dockerfile | 2 +- images/8.1/php/Dockerfile | 2 +- images/8.2/php/Dockerfile | 2 +- images/8.3/php/Dockerfile | 2 +- images/8.4/php/Dockerfile | 2 +- images/8.5/php/Dockerfile | 2 +- update.php | 18 +++++++++--------- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/images/7.2/php/Dockerfile b/images/7.2/php/Dockerfile index 2796730..7a49b85 100644 --- a/images/7.2/php/Dockerfile +++ b/images/7.2/php/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/7.3/php/Dockerfile b/images/7.3/php/Dockerfile index 453842b..0c9177f 100644 --- a/images/7.3/php/Dockerfile +++ b/images/7.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile index 1b91c6d..fece3c7 100644 --- a/images/7.4/php/Dockerfile +++ b/images/7.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile index 1bd8546..b36ebfd 100644 --- a/images/8.0/php/Dockerfile +++ b/images/8.0/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index ad716c1..6602988 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index e9224e4..50e9776 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile index 205b2b3..5515397 100644 --- a/images/8.3/php/Dockerfile +++ b/images/8.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index 6cb3b58..e38d959 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile index 5454ba8..212ef2c 100644 --- a/images/8.5/php/Dockerfile +++ b/images/8.5/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/update.php b/update.php index 3800f30..9ff0431 100644 --- a/update.php +++ b/update.php @@ -30,7 +30,7 @@ '7.2' => array( 'php' => array( 'base_name' => 'php:7.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ), 'composer' => true, @@ -44,7 +44,7 @@ '7.3' => array( 'php' => array( 'base_name' => 'php:7.3-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ), 'composer' => true, @@ -58,7 +58,7 @@ '7.4' => array( 'php' => array( 'base_name' => 'php:7.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ), 'composer' => true, @@ -72,7 +72,7 @@ '8.0' => array( 'php' => array( 'base_name' => 'php:8.0-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -86,7 +86,7 @@ '8.1' => array( 'php' => array( 'base_name' => 'php:8.1-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -100,7 +100,7 @@ '8.2' => array( 'php' => array( 'base_name' => 'php:8.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -114,7 +114,7 @@ '8.3' => array( 'php' => array( 'base_name' => 'php:8.3-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -128,7 +128,7 @@ '8.4' => array( 'php' => array( 'base_name' => 'php:8.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -142,7 +142,7 @@ '8.5' => array( 'php' => array( 'base_name' => 'php:8.5-rc-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array(), 'composer' => true, From fb32c3651b05885c5d6d08386b1eb8adaa374937 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 15 Sep 2025 22:10:12 -0400 Subject: [PATCH 05/10] Include the `libaom` library. --- images/8.1/php/Dockerfile | 2 +- images/8.2/php/Dockerfile | 2 +- images/8.3/php/Dockerfile | 2 +- images/8.4/php/Dockerfile | 2 +- images/8.5/php/Dockerfile | 2 +- update.php | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index 6602988..4590555 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index 50e9776..e8f62fc 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile index 5515397..4340ae3 100644 --- a/images/8.3/php/Dockerfile +++ b/images/8.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index e38d959..c3ad0fa 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile index 212ef2c..841f4d6 100644 --- a/images/8.5/php/Dockerfile +++ b/images/8.5/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/update.php b/update.php index 9ff0431..bbffbab 100644 --- a/update.php +++ b/update.php @@ -86,7 +86,7 @@ '8.1' => array( 'php' => array( 'base_name' => 'php:8.1-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -100,7 +100,7 @@ '8.2' => array( 'php' => array( 'base_name' => 'php:8.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -114,7 +114,7 @@ '8.3' => array( 'php' => array( 'base_name' => 'php:8.3-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -128,7 +128,7 @@ '8.4' => array( 'php' => array( 'base_name' => 'php:8.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -142,7 +142,7 @@ '8.5' => array( 'php' => array( 'base_name' => 'php:8.5-rc-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array(), 'composer' => true, From 960b689ac69cf68ebeee3a73db683c61abf0a147 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 16 Sep 2025 09:16:41 -0400 Subject: [PATCH 06/10] Add `libdav1d` --- images/8.1/php/Dockerfile | 2 +- images/8.2/php/Dockerfile | 2 +- images/8.4/php/Dockerfile | 2 +- images/8.5/php/Dockerfile | 2 +- update.php | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index 4590555..fdc2e7e 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libdav1d-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index e8f62fc..b699b3e 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libdav1d-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index c3ad0fa..274607d 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libdav1d-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile index 841f4d6..452d649 100644 --- a/images/8.5/php/Dockerfile +++ b/images/8.5/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libavif-dev libaom-dev libdav1d-dev libheif-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/update.php b/update.php index bbffbab..ff98a7f 100644 --- a/update.php +++ b/update.php @@ -86,7 +86,7 @@ '8.1' => array( 'php' => array( 'base_name' => 'php:8.1-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -100,7 +100,7 @@ '8.2' => array( 'php' => array( 'base_name' => 'php:8.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -128,7 +128,7 @@ '8.4' => array( 'php' => array( 'base_name' => 'php:8.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, @@ -142,7 +142,7 @@ '8.5' => array( 'php' => array( 'base_name' => 'php:8.5-rc-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array(), 'composer' => true, From 326057997e6088aa24d8c009fca1815399a6ac9a Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 16 Sep 2025 14:01:59 -0400 Subject: [PATCH 07/10] Remove `libheif` from PHP <= 8.0 AVIF is not supported in GD for these versions. Add this at a later date if necessary for something else (like HEIC/HEIF support). --- update.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/update.php b/update.php index ff98a7f..b25a10d 100644 --- a/update.php +++ b/update.php @@ -30,7 +30,7 @@ '7.2' => array( 'php' => array( 'base_name' => 'php:7.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ), 'composer' => true, @@ -44,7 +44,7 @@ '7.3' => array( 'php' => array( 'base_name' => 'php:7.3-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ), 'composer' => true, @@ -58,7 +58,7 @@ '7.4' => array( 'php' => array( 'base_name' => 'php:7.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ), 'composer' => true, @@ -72,7 +72,7 @@ '8.0' => array( 'php' => array( 'base_name' => 'php:8.0-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libheif-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), 'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ), 'composer' => true, From 82ac66557fb1d008fd4098dc29aa39582f85482e Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 16 Sep 2025 14:04:03 -0400 Subject: [PATCH 08/10] Update image files --- images/7.2/php/Dockerfile | 2 +- images/7.3/php/Dockerfile | 2 +- images/7.4/php/Dockerfile | 2 +- images/8.0/php/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/7.2/php/Dockerfile b/images/7.2/php/Dockerfile index 7a49b85..2796730 100644 --- a/images/7.2/php/Dockerfile +++ b/images/7.2/php/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/7.3/php/Dockerfile b/images/7.3/php/Dockerfile index 0c9177f..453842b 100644 --- a/images/7.3/php/Dockerfile +++ b/images/7.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile index fece3c7..1b91c6d 100644 --- a/images/7.4/php/Dockerfile +++ b/images/7.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile index b36ebfd..1bd8546 100644 --- a/images/8.0/php/Dockerfile +++ b/images/8.0/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libheif-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \ apt-get upgrade openssl -y; \ update-ca-certificates --fresh; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ From c7d9c3fddabc2a8f8778c7cbd4dcaf7bcebb8a71 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 16 Sep 2025 14:08:16 -0400 Subject: [PATCH 09/10] `--enable-gd` is not required. --- images/7.4/php/Dockerfile | 2 +- images/8.0/php/Dockerfile | 2 +- images/8.1/php/Dockerfile | 2 +- images/8.2/php/Dockerfile | 2 +- images/8.3/php/Dockerfile | 2 +- images/8.4/php/Dockerfile | 2 +- images/8.5/php/Dockerfile | 2 +- update.php | 3 +-- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile index 1b91c6d..54a7fe7 100644 --- a/images/7.4/php/Dockerfile +++ b/images/7.4/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile index 1bd8546..8056026 100644 --- a/images/8.0/php/Dockerfile +++ b/images/8.0/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index fdc2e7e..93a2758 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index b699b3e..0b957ad 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile index 4340ae3..8892935 100644 --- a/images/8.3/php/Dockerfile +++ b/images/8.3/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index 274607d..19e65ee 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/images/8.5/php/Dockerfile b/images/8.5/php/Dockerfile index 452d649..bcb5e58 100644 --- a/images/8.5/php/Dockerfile +++ b/images/8.5/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --enable-gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/usr; \ \ docker-php-ext-install gd mysqli zip exif intl mbstring; \ \ diff --git a/update.php b/update.php index b25a10d..4f5be67 100644 --- a/update.php +++ b/update.php @@ -433,10 +433,9 @@ $gd_options = array(); - if ( version_compare( $version, '7.4' ) >= 0 ) { + if ( version_compare( $version, '7.4' ) > 0 ) { $gd_options = array_merge( array( - '--enable-gd', '--with-jpeg=/usr', '--with-webp=/usr', ), From bc740c156ba3c680235abe65afb4c0efb97a57b7 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 16 Sep 2025 14:09:11 -0400 Subject: [PATCH 10/10] PHP 7.4 does not need `--with-gd`. --- images/7.4/php/Dockerfile | 2 +- update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile index 54a7fe7..d6461ca 100644 --- a/images/7.4/php/Dockerfile +++ b/images/7.4/php/Dockerfile @@ -23,7 +23,7 @@ RUN set -ex; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ - docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr -with-png-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ diff --git a/update.php b/update.php index 4f5be67..e217db9 100644 --- a/update.php +++ b/update.php @@ -433,7 +433,7 @@ $gd_options = array(); - if ( version_compare( $version, '7.4' ) > 0 ) { + if ( version_compare( $version, '7.4' ) >= 0 ) { $gd_options = array_merge( array( '--with-jpeg=/usr',