diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index 90ba29a..9e65bec 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -17,13 +17,13 @@ RUN set -ex; \ \ apt-get update; \ \ - 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 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; \ locale-gen; \ \ - docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/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.2/php/Dockerfile b/images/8.2/php/Dockerfile index 05640bd..c5f4164 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -17,13 +17,13 @@ RUN set -ex; \ \ apt-get update; \ \ - 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 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; \ locale-gen; \ \ - docker-php-ext-configure gd --with-jpeg=/usr --with-webp=/usr --with-avif=/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 d021b95..795c05b 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', 'libdav1d-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.5', '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', 'libdav1d-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.5', 'imagick' ), 'composer' => true, @@ -453,7 +453,7 @@ ); } - if ( version_compare( $version, '8.1' ) >= 0 ) { + if ( version_compare( $version, '8.3' ) >= 0 ) { $gd_options[] = '--with-avif=/usr'; }