From 949bf57d18388e3a62626d3e52f793f0c0cce4e4 Mon Sep 17 00:00:00 2001 From: Lubomir Stanko Date: Tue, 12 Mar 2024 14:32:01 +0100 Subject: [PATCH] Update php and packages, add support for HEIC/AVIF picture format --- README.md | 10 +++++----- build/php82/cli/base/Dockerfile | 6 +++--- build/php82/cli/vipsffmpeg/Dockerfile | 7 ++++--- build/php82/fpm/vipsffmpeg-nginx/Dockerfile | 9 +++++---- build/php83/cli/base/Dockerfile | 6 +++--- build/php83/cli/vipsffmpeg/Dockerfile | 7 ++++--- build/php83/fpm/vipsffmpeg-nginx/Dockerfile | 9 +++++---- doc/PHP-Changelog/3.2.0.md | 13 +++++++++++++ variant-vipsffmpeg.Dockerfile | 1 + versions.conf | 10 +++++----- 10 files changed, 48 insertions(+), 30 deletions(-) create mode 100644 doc/PHP-Changelog/3.2.0.md diff --git a/README.md b/README.md index ebec73e..24df56e 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,16 @@ Additionally, it has preinstalled some libraries (xdebug, libvips, redis, mongod ## What's inside -- PHP 8.2 - 8.2.15 -- PHP 8.3 - 8.3.2 +- PHP 8.2 - 8.2.16 +- PHP 8.3 - 8.3.3 - PHP Apcu ext - 5.1.23 - PHP Mongodb ext - 1.17.2 - PHP Redis ext - 6.0.2 - PHP Pcov ext - 1.0.11 - PHP Xdebug ext - 3.3.1 -- Redis (client) - 6.2.13 +- Redis (client) - 6.2.14 - Supervisor - 4.2.5 -- Composer - 2.6.6 +- Composer - 2.7.1 - Vipsffmpeg variant: - PHP Vips ext - 1.0.13 - FFmpeg - 5.1.4 @@ -27,7 +27,7 @@ Additionally, it has preinstalled some libraries (xdebug, libvips, redis, mongod - Nginx-xslt - 1.24.0 - Nginx-geoip - 1.24.0 - Nginx-image-filter - 1.24.0 - - Nginx-njs - 0.8.2 + - Nginx-njs - 0.8.3 ### Special common commands diff --git a/build/php82/cli/base/Dockerfile b/build/php82/cli/base/Dockerfile index 3c90743..30e8dc6 100644 --- a/build/php82/cli/base/Dockerfile +++ b/build/php82/cli/base/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY! # CHECK README FOR MORE INFO. # -FROM php:8.2.15-cli +FROM php:8.2.16-cli LABEL maintainer="Lubomir Stanko " @@ -159,7 +159,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.6.6 + --version=2.7.1 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -170,7 +170,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${REDIS_KEYRING} && \ echo "deb [signed-by=${REDIS_KEYRING}] https://packages.redis.io/deb ${REDIS_REPO} main" > /etc/apt/sources.list.d/redis.list && \ apt-get update && \ - apt-get install -y redis-tools=6:6.2.13-1rl1~bookworm1 && \ + apt-get install -y redis-tools=6:6.2.14-1rl1~bookworm1 && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* diff --git a/build/php82/cli/vipsffmpeg/Dockerfile b/build/php82/cli/vipsffmpeg/Dockerfile index 4097a5e..34219b9 100644 --- a/build/php82/cli/vipsffmpeg/Dockerfile +++ b/build/php82/cli/vipsffmpeg/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY! # CHECK README FOR MORE INFO. # -FROM php:8.2.15-cli +FROM php:8.2.16-cli LABEL maintainer="Lubomir Stanko " @@ -159,7 +159,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.6.6 + --version=2.7.1 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -170,7 +170,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${REDIS_KEYRING} && \ echo "deb [signed-by=${REDIS_KEYRING}] https://packages.redis.io/deb ${REDIS_REPO} main" > /etc/apt/sources.list.d/redis.list && \ apt-get update && \ - apt-get install -y redis-tools=6:6.2.13-1rl1~bookworm1 && \ + apt-get install -y redis-tools=6:6.2.14-1rl1~bookworm1 && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -211,6 +211,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libfile-mimeinfo-perl \ libgif-dev \ libgsf-1-114 \ + libheif-dev \ libjpeg62-turbo \ libmatio11 \ liborc-0.4-dev \ diff --git a/build/php82/fpm/vipsffmpeg-nginx/Dockerfile b/build/php82/fpm/vipsffmpeg-nginx/Dockerfile index e3200c4..bf28111 100644 --- a/build/php82/fpm/vipsffmpeg-nginx/Dockerfile +++ b/build/php82/fpm/vipsffmpeg-nginx/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY! # CHECK README FOR MORE INFO. # -FROM php:8.2.15-fpm +FROM php:8.2.16-fpm LABEL maintainer="Lubomir Stanko " @@ -159,7 +159,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.6.6 + --version=2.7.1 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -170,7 +170,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${REDIS_KEYRING} && \ echo "deb [signed-by=${REDIS_KEYRING}] https://packages.redis.io/deb ${REDIS_REPO} main" > /etc/apt/sources.list.d/redis.list && \ apt-get update && \ - apt-get install -y redis-tools=6:6.2.13-1rl1~bookworm1 && \ + apt-get install -y redis-tools=6:6.2.14-1rl1~bookworm1 && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -211,6 +211,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libfile-mimeinfo-perl \ libgif-dev \ libgsf-1-114 \ + libheif-dev \ libjpeg62-turbo \ libmatio11 \ liborc-0.4-dev \ @@ -331,7 +332,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ nginx-module-xslt=1.24.0-1~bookworm \ nginx-module-geoip=1.24.0-1~bookworm \ nginx-module-image-filter=1.24.0-1~bookworm \ - nginx-module-njs=1.24.0+0.8.2-1~bookworm && \ + nginx-module-njs=1.24.0+0.8.3-1~bookworm && \ # Cleanup apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/build/php83/cli/base/Dockerfile b/build/php83/cli/base/Dockerfile index 30320c4..d7bc047 100644 --- a/build/php83/cli/base/Dockerfile +++ b/build/php83/cli/base/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY! # CHECK README FOR MORE INFO. # -FROM php:8.3.2-cli +FROM php:8.3.3-cli LABEL maintainer="Lubomir Stanko " @@ -159,7 +159,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.6.6 + --version=2.7.1 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -170,7 +170,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${REDIS_KEYRING} && \ echo "deb [signed-by=${REDIS_KEYRING}] https://packages.redis.io/deb ${REDIS_REPO} main" > /etc/apt/sources.list.d/redis.list && \ apt-get update && \ - apt-get install -y redis-tools=6:6.2.13-1rl1~bookworm1 && \ + apt-get install -y redis-tools=6:6.2.14-1rl1~bookworm1 && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* diff --git a/build/php83/cli/vipsffmpeg/Dockerfile b/build/php83/cli/vipsffmpeg/Dockerfile index 5bf15cc..9a936cb 100644 --- a/build/php83/cli/vipsffmpeg/Dockerfile +++ b/build/php83/cli/vipsffmpeg/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY! # CHECK README FOR MORE INFO. # -FROM php:8.3.2-cli +FROM php:8.3.3-cli LABEL maintainer="Lubomir Stanko " @@ -159,7 +159,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.6.6 + --version=2.7.1 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -170,7 +170,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${REDIS_KEYRING} && \ echo "deb [signed-by=${REDIS_KEYRING}] https://packages.redis.io/deb ${REDIS_REPO} main" > /etc/apt/sources.list.d/redis.list && \ apt-get update && \ - apt-get install -y redis-tools=6:6.2.13-1rl1~bookworm1 && \ + apt-get install -y redis-tools=6:6.2.14-1rl1~bookworm1 && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -211,6 +211,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libfile-mimeinfo-perl \ libgif-dev \ libgsf-1-114 \ + libheif-dev \ libjpeg62-turbo \ libmatio11 \ liborc-0.4-dev \ diff --git a/build/php83/fpm/vipsffmpeg-nginx/Dockerfile b/build/php83/fpm/vipsffmpeg-nginx/Dockerfile index 1339327..555bb9c 100644 --- a/build/php83/fpm/vipsffmpeg-nginx/Dockerfile +++ b/build/php83/fpm/vipsffmpeg-nginx/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY! # CHECK README FOR MORE INFO. # -FROM php:8.3.2-fpm +FROM php:8.3.3-fpm LABEL maintainer="Lubomir Stanko " @@ -159,7 +159,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.6.6 + --version=2.7.1 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -170,7 +170,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${REDIS_KEYRING} && \ echo "deb [signed-by=${REDIS_KEYRING}] https://packages.redis.io/deb ${REDIS_REPO} main" > /etc/apt/sources.list.d/redis.list && \ apt-get update && \ - apt-get install -y redis-tools=6:6.2.13-1rl1~bookworm1 && \ + apt-get install -y redis-tools=6:6.2.14-1rl1~bookworm1 && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -211,6 +211,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libfile-mimeinfo-perl \ libgif-dev \ libgsf-1-114 \ + libheif-dev \ libjpeg62-turbo \ libmatio11 \ liborc-0.4-dev \ @@ -331,7 +332,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ nginx-module-xslt=1.24.0-1~bookworm \ nginx-module-geoip=1.24.0-1~bookworm \ nginx-module-image-filter=1.24.0-1~bookworm \ - nginx-module-njs=1.24.0+0.8.2-1~bookworm && \ + nginx-module-njs=1.24.0+0.8.3-1~bookworm && \ # Cleanup apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/doc/PHP-Changelog/3.2.0.md b/doc/PHP-Changelog/3.2.0.md new file mode 100644 index 0000000..b8a2dee --- /dev/null +++ b/doc/PHP-Changelog/3.2.0.md @@ -0,0 +1,13 @@ +2024-03-12 +=== + +### Added +- Add support for `HEIC/AVIF` picture format in vips docker image variants + +### Changed +- Docker packages update + - php 8.2 `8.2.16` + - php 8.3 `8.3.3` + - composer `2.7.1` + - nginx njs `0.8.3` + - redis client `6.2.14` diff --git a/variant-vipsffmpeg.Dockerfile b/variant-vipsffmpeg.Dockerfile index 2fbd325..c984528 100644 --- a/variant-vipsffmpeg.Dockerfile +++ b/variant-vipsffmpeg.Dockerfile @@ -33,6 +33,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libfile-mimeinfo-perl \ libgif-dev \ libgsf-1-114 \ + libheif-dev \ libjpeg62-turbo \ libmatio11 \ liborc-0.4-dev \ diff --git a/versions.conf b/versions.conf index e6663f3..9924797 100644 --- a/versions.conf +++ b/versions.conf @@ -1,5 +1,5 @@ -export PHP82_VERSION=8.2.15 -export PHP83_VERSION=8.3.2 +export PHP82_VERSION=8.2.16 +export PHP83_VERSION=8.3.3 # Pecl ext versions export PECL_APCU_VERSION=5.1.23 export PECL_MONGODB_VERSION=1.17.2 @@ -9,15 +9,15 @@ export PECL_VIPS_VERSION=1.0.13 export PECL_XDEBUG_VERSION=3.3.1 # Nginx version export NGINX_VERSION=1.24.0 -export NGINX_NJS_VERSION=0.8.2 +export NGINX_NJS_VERSION=0.8.3 export NGINX_PKG_RELEASE=1~bookworm # Php Security Checker version export PHP_SECURITY_CHECKER_VERSION=2.0.6 # Composer version -export COMPOSER_VERSION=2.6.6 +export COMPOSER_VERSION=2.7.1 # Redis version export REDIS_PRE_RELEASE=6 -export REDIS_VERSION=6.2.13 +export REDIS_VERSION=6.2.14 export REDIS_PKG_RELEASE=1rl1~bookworm1 # Supervisor version export SUPERVISOR_VERSION=4.2.5