diff --git a/build/php82/cli/base/Dockerfile b/build/php82/cli/base/Dockerfile index cfbfd2f..4186324 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.18-cli +FROM php:8.2.23-cli LABEL maintainer="Lubomir Stanko " @@ -91,11 +91,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="4.2.5" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=4.2.5-1 && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -125,7 +126,7 @@ RUN apt-get update && \ apt-get install -y \ ${PECL_BUILD_DEPS} && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.23 && \ - yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.18.1 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.19.3 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install pcov-1.0.11 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install redis-6.0.2 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ @@ -151,7 +152,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v2.1.3/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -162,18 +163,19 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.2 + --version=2.7.8 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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:7.2.4-1rl1~bookworm1 && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="7.2.4" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # 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 24e164c..fc7f332 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.18-cli +FROM php:8.2.23-cli LABEL maintainer="Lubomir Stanko " @@ -91,11 +91,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="4.2.5" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=4.2.5-1 && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -125,7 +126,7 @@ RUN apt-get update && \ apt-get install -y \ ${PECL_BUILD_DEPS} && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.23 && \ - yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.18.1 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.19.3 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install pcov-1.0.11 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install redis-6.0.2 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ @@ -151,7 +152,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v2.1.3/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -162,18 +163,19 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.2 + --version=2.7.8 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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:7.2.4-1rl1~bookworm1 && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="7.2.4" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -238,10 +240,10 @@ RUN DEBIAN_FRONTEND=noninteractive && \ ${VIPS_RUN_DEPS} && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.2/vips-8.15.2.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.2 && \ + cd vips-8.15.3 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ @@ -266,17 +268,18 @@ RUN DEBIAN_FRONTEND=noninteractive && \ # Package installation RUN DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ + APT_FFMPEG_VERSION=$(apt-cache madison ffmpeg | awk -v ver="5.1.6" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ - ffmpeg=7:5.1.4-0+deb12u1 \ - libavcodec59=7:5.1.4-0+deb12u1 \ - libavdevice59=7:5.1.4-0+deb12u1 \ - libavfilter8=7:5.1.4-0+deb12u1 \ - libavformat59=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libavutil57=7:5.1.4-0+deb12u1 \ - libpostproc56=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libswscale6=7:5.1.4-0+deb12u1 && \ + ffmpeg=${APT_FFMPEG_VERSION} \ + libavcodec59=${APT_FFMPEG_VERSION} \ + libavdevice59=${APT_FFMPEG_VERSION} \ + libavfilter8=${APT_FFMPEG_VERSION} \ + libavformat59=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libavutil57=${APT_FFMPEG_VERSION} \ + libpostproc56=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libswscale6=${APT_FFMPEG_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* diff --git a/build/php82/fpm/vipsffmpeg-nginx/Dockerfile b/build/php82/fpm/vipsffmpeg-nginx/Dockerfile index 3b7d09d..cebdf16 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.18-fpm +FROM php:8.2.23-fpm LABEL maintainer="Lubomir Stanko " @@ -91,11 +91,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="4.2.5" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=4.2.5-1 && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -125,7 +126,7 @@ RUN apt-get update && \ apt-get install -y \ ${PECL_BUILD_DEPS} && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.23 && \ - yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.18.1 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.19.3 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install pcov-1.0.11 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install redis-6.0.2 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ @@ -151,7 +152,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v2.1.3/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -162,18 +163,19 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.2 + --version=2.7.8 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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:7.2.4-1rl1~bookworm1 && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="7.2.4" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -238,10 +240,10 @@ RUN DEBIAN_FRONTEND=noninteractive && \ ${VIPS_RUN_DEPS} && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.2/vips-8.15.2.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.2 && \ + cd vips-8.15.3 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ @@ -266,17 +268,18 @@ RUN DEBIAN_FRONTEND=noninteractive && \ # Package installation RUN DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ + APT_FFMPEG_VERSION=$(apt-cache madison ffmpeg | awk -v ver="5.1.6" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ - ffmpeg=7:5.1.4-0+deb12u1 \ - libavcodec59=7:5.1.4-0+deb12u1 \ - libavdevice59=7:5.1.4-0+deb12u1 \ - libavfilter8=7:5.1.4-0+deb12u1 \ - libavformat59=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libavutil57=7:5.1.4-0+deb12u1 \ - libpostproc56=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libswscale6=7:5.1.4-0+deb12u1 && \ + ffmpeg=${APT_FFMPEG_VERSION} \ + libavcodec59=${APT_FFMPEG_VERSION} \ + libavdevice59=${APT_FFMPEG_VERSION} \ + libavfilter8=${APT_FFMPEG_VERSION} \ + libavformat59=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libavutil57=${APT_FFMPEG_VERSION} \ + libpostproc56=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libswscale6=${APT_FFMPEG_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -329,12 +332,17 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o ${NGINX_KEYRING} && \ echo "deb [signed-by=${NGINX_KEYRING}] http://nginx.org/packages/debian ${NGINX_REPO}" > /etc/apt/sources.list.d/nginx.list && \ apt-get update && \ + APT_NGINX_VERSION=$(apt-cache madison nginx | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_GEOIP_VERSION=$(apt-cache madison nginx-module-geoip | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_IMAGE_FILTER_VERSION=$(apt-cache madison nginx-module-image-filter | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_NJS_VERSION=$(apt-cache madison nginx-module-njs | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_XSLT_VERSION=$(apt-cache madison nginx-module-xslt | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ apt-get install --no-install-recommends --no-install-suggests -y \ - nginx=1.24.0-1~bookworm \ - 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.3-1~bookworm && \ + nginx=${APT_NGINX_VERSION} \ + nginx-module-geoip=${APT_NGINX_MODULE_GEOIP_VERSION} \ + nginx-module-image-filter=${APT_NGINX_MODULE_IMAGE_FILTER_VERSION} \ + nginx-module-njs=${APT_NGINX_MODULE_NJS_VERSION} \ + nginx-module-xslt=${APT_NGINX_MODULE_XSLT_VERSION} && \ # 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 76e718e..c6f716d 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.6-cli +FROM php:8.3.11-cli LABEL maintainer="Lubomir Stanko " @@ -91,11 +91,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="4.2.5" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=4.2.5-1 && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -125,7 +126,7 @@ RUN apt-get update && \ apt-get install -y \ ${PECL_BUILD_DEPS} && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.23 && \ - yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.18.1 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.19.3 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install pcov-1.0.11 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install redis-6.0.2 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ @@ -151,7 +152,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v2.1.3/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -162,18 +163,19 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.2 + --version=2.7.8 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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:7.2.4-1rl1~bookworm1 && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="7.2.4" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # 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 eb336cd..a9ffb8f 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.6-cli +FROM php:8.3.11-cli LABEL maintainer="Lubomir Stanko " @@ -91,11 +91,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="4.2.5" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=4.2.5-1 && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -125,7 +126,7 @@ RUN apt-get update && \ apt-get install -y \ ${PECL_BUILD_DEPS} && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.23 && \ - yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.18.1 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.19.3 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install pcov-1.0.11 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install redis-6.0.2 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ @@ -151,7 +152,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v2.1.3/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -162,18 +163,19 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.2 + --version=2.7.8 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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:7.2.4-1rl1~bookworm1 && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="7.2.4" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -238,10 +240,10 @@ RUN DEBIAN_FRONTEND=noninteractive && \ ${VIPS_RUN_DEPS} && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.2/vips-8.15.2.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.2 && \ + cd vips-8.15.3 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ @@ -266,17 +268,18 @@ RUN DEBIAN_FRONTEND=noninteractive && \ # Package installation RUN DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ + APT_FFMPEG_VERSION=$(apt-cache madison ffmpeg | awk -v ver="5.1.6" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ - ffmpeg=7:5.1.4-0+deb12u1 \ - libavcodec59=7:5.1.4-0+deb12u1 \ - libavdevice59=7:5.1.4-0+deb12u1 \ - libavfilter8=7:5.1.4-0+deb12u1 \ - libavformat59=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libavutil57=7:5.1.4-0+deb12u1 \ - libpostproc56=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libswscale6=7:5.1.4-0+deb12u1 && \ + ffmpeg=${APT_FFMPEG_VERSION} \ + libavcodec59=${APT_FFMPEG_VERSION} \ + libavdevice59=${APT_FFMPEG_VERSION} \ + libavfilter8=${APT_FFMPEG_VERSION} \ + libavformat59=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libavutil57=${APT_FFMPEG_VERSION} \ + libpostproc56=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libswscale6=${APT_FFMPEG_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* diff --git a/build/php83/fpm/vipsffmpeg-nginx/Dockerfile b/build/php83/fpm/vipsffmpeg-nginx/Dockerfile index 4490166..3ce88a4 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.6-fpm +FROM php:8.3.11-fpm LABEL maintainer="Lubomir Stanko " @@ -91,11 +91,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="4.2.5" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=4.2.5-1 && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -125,7 +126,7 @@ RUN apt-get update && \ apt-get install -y \ ${PECL_BUILD_DEPS} && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.23 && \ - yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.18.1 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.19.3 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install pcov-1.0.11 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install redis-6.0.2 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ @@ -151,7 +152,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v2.1.3/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -162,18 +163,19 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.2 + --version=2.7.8 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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:7.2.4-1rl1~bookworm1 && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="7.2.4" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -238,10 +240,10 @@ RUN DEBIAN_FRONTEND=noninteractive && \ ${VIPS_RUN_DEPS} && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.2/vips-8.15.2.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.2 && \ + cd vips-8.15.3 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ @@ -266,17 +268,18 @@ RUN DEBIAN_FRONTEND=noninteractive && \ # Package installation RUN DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ + APT_FFMPEG_VERSION=$(apt-cache madison ffmpeg | awk -v ver="5.1.6" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ - ffmpeg=7:5.1.4-0+deb12u1 \ - libavcodec59=7:5.1.4-0+deb12u1 \ - libavdevice59=7:5.1.4-0+deb12u1 \ - libavfilter8=7:5.1.4-0+deb12u1 \ - libavformat59=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libavutil57=7:5.1.4-0+deb12u1 \ - libpostproc56=7:5.1.4-0+deb12u1 \ - libswresample4=7:5.1.4-0+deb12u1 \ - libswscale6=7:5.1.4-0+deb12u1 && \ + ffmpeg=${APT_FFMPEG_VERSION} \ + libavcodec59=${APT_FFMPEG_VERSION} \ + libavdevice59=${APT_FFMPEG_VERSION} \ + libavfilter8=${APT_FFMPEG_VERSION} \ + libavformat59=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libavutil57=${APT_FFMPEG_VERSION} \ + libpostproc56=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libswscale6=${APT_FFMPEG_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -329,12 +332,17 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o ${NGINX_KEYRING} && \ echo "deb [signed-by=${NGINX_KEYRING}] http://nginx.org/packages/debian ${NGINX_REPO}" > /etc/apt/sources.list.d/nginx.list && \ apt-get update && \ + APT_NGINX_VERSION=$(apt-cache madison nginx | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_GEOIP_VERSION=$(apt-cache madison nginx-module-geoip | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_IMAGE_FILTER_VERSION=$(apt-cache madison nginx-module-image-filter | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_NJS_VERSION=$(apt-cache madison nginx-module-njs | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_XSLT_VERSION=$(apt-cache madison nginx-module-xslt | awk -v ver="1.26.2" '$3 ~ ver {print $3; exit}') && \ apt-get install --no-install-recommends --no-install-suggests -y \ - nginx=1.24.0-1~bookworm \ - 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.3-1~bookworm && \ + nginx=${APT_NGINX_VERSION} \ + nginx-module-geoip=${APT_NGINX_MODULE_GEOIP_VERSION} \ + nginx-module-image-filter=${APT_NGINX_MODULE_IMAGE_FILTER_VERSION} \ + nginx-module-njs=${APT_NGINX_MODULE_NJS_VERSION} \ + nginx-module-xslt=${APT_NGINX_MODULE_XSLT_VERSION} && \ # Cleanup apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/doc/PHP-Changelog/3.4.0.md b/doc/PHP-Changelog/3.4.0.md new file mode 100644 index 0000000..c1f7026 --- /dev/null +++ b/doc/PHP-Changelog/3.4.0.md @@ -0,0 +1,14 @@ +2024-09-02 +=== + +### Changed +- Updated configuration for apt package installation not having to specify exact apt package build version +- Docker packages update: + - php 8.2 `8.2.23` + - php 8.3 `8.3.11` + - php ext mongodb `1.19.3` + - php security checker `2.1.3` + - nginx `1.26.2` + - composer `2.7.8` + - ffmpeg `5.1.6` + - libvips `8.15.3` diff --git a/template.Dockerfile b/template.Dockerfile index 24c877f..85694ef 100644 --- a/template.Dockerfile +++ b/template.Dockerfile @@ -85,11 +85,12 @@ ENV RUN_DEPS="ca-certificates \ # Initialization with PHP installation # ---------------------------------------------------------------------------------------------------------------------- RUN apt-get update && \ + APT_SUPERVISOR_VERSION=$(apt-cache madison supervisor | awk -v ver="${SUPERVISOR_VERSION}" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ ${BUILD_DEPS} \ ${PECL_BUILD_DEPS} \ ${RUN_DEPS} \ - supervisor=${SUPERVISOR_VERSION}-${SUPERVISOR_PKG_RELEASE} && \ + supervisor=${APT_SUPERVISOR_VERSION} && \ docker-php-ext-configure intl && \ docker-php-ext-configure opcache && \ docker-php-ext-configure pcntl --enable-pcntl && \ @@ -145,7 +146,7 @@ RUN apt-get update && \ # ---------------------------------------------------------------------------------------------------------------------- # Php Security Checker binary package setup RUN wget -q \ - https://github.com/fabpot/local-php-security-checker/releases/download/v${PHP_SECURITY_CHECKER_VERSION}/local-php-security-checker_${PHP_SECURITY_CHECKER_VERSION}_linux_amd64 \ + https://github.com/fabpot/local-php-security-checker/releases/download/v${PHP_SECURITY_CHECKER_VERSION}/local-php-security-checker_linux_amd64 \ -O /usr/local/bin/local-php-security-checker && \ chmod +x /usr/local/bin/local-php-security-checker @@ -161,13 +162,14 @@ RUN curl -sS https://getcomposer.org/installer | \ # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS # ---------------------------------------------------------------------------------------------------------------------- -RUN DEBIAN_FRONTEND=noninteractive && \ + RUN DEBIAN_FRONTEND=noninteractive && \ REDIS_KEYRING=/usr/share/keyrings/redis-archive-keyring.gpg && \ REDIS_REPO="$(lsb_release -c -s)" && \ 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=${REDIS_PRE_RELEASE}:${REDIS_VERSION}-${REDIS_PKG_RELEASE} && \ + APT_REDIS_TOOLS_VERSION=$(apt-cache madison redis-tools | awk -v ver="${REDIS_VERSION}" '$3 ~ ver {print $3; exit}') && \ + apt-get install -y redis-tools=${APT_REDIS_TOOLS_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* diff --git a/variant-nginx.Dockerfile b/variant-nginx.Dockerfile index 6c107dd..ad2c6a4 100644 --- a/variant-nginx.Dockerfile +++ b/variant-nginx.Dockerfile @@ -43,12 +43,17 @@ RUN DEBIAN_FRONTEND=noninteractive && \ curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o ${NGINX_KEYRING} && \ echo "deb [signed-by=${NGINX_KEYRING}] http://nginx.org/packages/debian ${NGINX_REPO}" > /etc/apt/sources.list.d/nginx.list && \ apt-get update && \ + APT_NGINX_VERSION=$(apt-cache madison nginx | awk -v ver="${NGINX_VERSION}" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_GEOIP_VERSION=$(apt-cache madison nginx-module-geoip | awk -v ver="${NGINX_VERSION}" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_IMAGE_FILTER_VERSION=$(apt-cache madison nginx-module-image-filter | awk -v ver="${NGINX_VERSION}" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_NJS_VERSION=$(apt-cache madison nginx-module-njs | awk -v ver="${NGINX_VERSION}" '$3 ~ ver {print $3; exit}') && \ + APT_NGINX_MODULE_XSLT_VERSION=$(apt-cache madison nginx-module-xslt | awk -v ver="${NGINX_VERSION}" '$3 ~ ver {print $3; exit}') && \ apt-get install --no-install-recommends --no-install-suggests -y \ - nginx=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \ - nginx-module-xslt=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \ - nginx-module-geoip=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \ - nginx-module-image-filter=${NGINX_VERSION}-${NGINX_PKG_RELEASE} \ - nginx-module-njs=${NGINX_VERSION}+${NGINX_NJS_VERSION}-${NGINX_PKG_RELEASE} && \ + nginx=${APT_NGINX_VERSION} \ + nginx-module-geoip=${APT_NGINX_MODULE_GEOIP_VERSION} \ + nginx-module-image-filter=${APT_NGINX_MODULE_IMAGE_FILTER_VERSION} \ + nginx-module-njs=${APT_NGINX_MODULE_NJS_VERSION} \ + nginx-module-xslt=${APT_NGINX_MODULE_XSLT_VERSION} && \ # Cleanup apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/variant-vipsffmpeg.Dockerfile b/variant-vipsffmpeg.Dockerfile index c984528..25234d2 100644 --- a/variant-vipsffmpeg.Dockerfile +++ b/variant-vipsffmpeg.Dockerfile @@ -85,17 +85,18 @@ RUN DEBIAN_FRONTEND=noninteractive && \ # Package installation RUN DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ + APT_FFMPEG_VERSION=$(apt-cache madison ffmpeg | awk -v ver="${FFMPEG_VERSION}" '$3 ~ ver {print $3; exit}') && \ apt-get install -y \ - ffmpeg=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libavcodec59=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libavdevice59=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libavfilter8=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libavformat59=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libswresample4=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libavutil57=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libpostproc56=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libswresample4=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} \ - libswscale6=${FFMPEG_PRE_RELEASE}:${FFMPEG_VERSION}-${FFMPEG_PKG_RELEASE} && \ + ffmpeg=${APT_FFMPEG_VERSION} \ + libavcodec59=${APT_FFMPEG_VERSION} \ + libavdevice59=${APT_FFMPEG_VERSION} \ + libavfilter8=${APT_FFMPEG_VERSION} \ + libavformat59=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libavutil57=${APT_FFMPEG_VERSION} \ + libpostproc56=${APT_FFMPEG_VERSION} \ + libswresample4=${APT_FFMPEG_VERSION} \ + libswscale6=${APT_FFMPEG_VERSION} && \ # Cleanup apt-get clean && \ rm -r /var/lib/apt/lists/* diff --git a/versions.conf b/versions.conf index a36944e..91ebec8 100644 --- a/versions.conf +++ b/versions.conf @@ -1,30 +1,23 @@ -export PHP82_VERSION=8.2.18 -export PHP83_VERSION=8.3.6 +export PHP82_VERSION=8.2.23 +export PHP83_VERSION=8.3.11 # Pecl ext versions export PECL_APCU_VERSION=5.1.23 -export PECL_MONGODB_VERSION=1.18.1 +export PECL_MONGODB_VERSION=1.19.3 export PECL_PCOV_VERSION=1.0.11 export PECL_REDIS_VERSION=6.0.2 export PECL_VIPS_VERSION=1.0.13 export PECL_XDEBUG_VERSION=3.3.2 # Nginx version -export NGINX_VERSION=1.24.0 -export NGINX_NJS_VERSION=0.8.3 -export NGINX_PKG_RELEASE=1~bookworm +export NGINX_VERSION=1.26.2 # Php Security Checker version -export PHP_SECURITY_CHECKER_VERSION=2.0.6 +export PHP_SECURITY_CHECKER_VERSION=2.1.3 # Composer version -export COMPOSER_VERSION=2.7.2 +export COMPOSER_VERSION=2.7.8 # Redis version -export REDIS_PRE_RELEASE=6 export REDIS_VERSION=7.2.4 -export REDIS_PKG_RELEASE=1rl1~bookworm1 # Supervisor version export SUPERVISOR_VERSION=4.2.5 -export SUPERVISOR_PKG_RELEASE=1 # FFmpeg version -export FFMPEG_PRE_RELEASE=7 -export FFMPEG_VERSION=5.1.4 -export FFMPEG_PKG_RELEASE=0+deb12u1 +export FFMPEG_VERSION=5.1.6 # Libvips version -export LIBVIPS_VERSION=8.15.2 +export LIBVIPS_VERSION=8.15.3