diff --git a/build/php82/cli/base/Dockerfile b/build/php82/cli/base/Dockerfile index 4186324..0630f76 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.23-cli +FROM php:8.2.26-cli LABEL maintainer="Lubomir Stanko " @@ -27,6 +27,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -125,10 +126,10 @@ RUN apt-get update && \ 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.19.3 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.24 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.20.0 && \ 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 redis-6.1.0 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ docker-php-ext-enable \ apcu \ @@ -147,15 +148,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# Php Security Checker binary package setup -RUN wget -q \ - 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 - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- @@ -163,7 +155,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.8 + --version=2.8.3 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS diff --git a/build/php82/cli/base/usr/local/etc/php/php.ini b/build/php82/cli/base/usr/local/etc/php/php.ini index 99031ee..c630589 100644 --- a/build/php82/cli/base/usr/local/etc/php/php.ini +++ b/build/php82/cli/base/usr/local/etc/php/php.ini @@ -1959,6 +1959,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/build/php82/cli/vipsffmpeg/Dockerfile b/build/php82/cli/vipsffmpeg/Dockerfile index fc7f332..bf945df 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.23-cli +FROM php:8.2.26-cli LABEL maintainer="Lubomir Stanko " @@ -27,6 +27,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -125,10 +126,10 @@ RUN apt-get update && \ 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.19.3 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.24 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.20.0 && \ 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 redis-6.1.0 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ docker-php-ext-enable \ apcu \ @@ -147,15 +148,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# Php Security Checker binary package setup -RUN wget -q \ - 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 - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- @@ -163,7 +155,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.8 + --version=2.8.3 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -187,6 +179,7 @@ RUN curl -sS https://getcomposer.org/installer | \ # ---------------------------------------------------------------------------------------------------------------------- # VIPS ENVIRONMENT VARIABLES # Packages +ENV PHP_FFI_ENABLED=true ENV VIPS_BUILD_DEPS="automake \ build-essential \ libexpat1-dev \ @@ -212,6 +205,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libcfitsio-dev \ libcurl4-openssl-dev \ libexif-dev \ + libffi8 \ libfftw3-dev \ libfile-mimeinfo-perl \ libgif-dev \ @@ -219,9 +213,9 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libheif-dev \ libjpeg62-turbo \ libmatio11 \ - liborc-0.4-dev \ libopenexr-3-1-30 \ libopenslide-dev \ + liborc-0.4-dev \ libpango1.0-dev \ libpoppler-glib8 \ librsvg2-dev \ @@ -238,12 +232,15 @@ RUN DEBIAN_FRONTEND=noninteractive && \ apt-get install -y \ ${VIPS_BUILD_DEPS} \ ${VIPS_RUN_DEPS} && \ + docker-php-ext-configure ffi && \ + docker-php-ext-install -j$(nproc) \ + ffi && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.16.0/vips-8.16.0.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.3 && \ + cd vips-8.16.0 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ diff --git a/build/php82/cli/vipsffmpeg/usr/local/etc/php/php.ini b/build/php82/cli/vipsffmpeg/usr/local/etc/php/php.ini index 99031ee..c630589 100644 --- a/build/php82/cli/vipsffmpeg/usr/local/etc/php/php.ini +++ b/build/php82/cli/vipsffmpeg/usr/local/etc/php/php.ini @@ -1959,6 +1959,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/build/php82/fpm/vipsffmpeg-nginx/Dockerfile b/build/php82/fpm/vipsffmpeg-nginx/Dockerfile index cebdf16..35ca4f9 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.23-fpm +FROM php:8.2.26-fpm LABEL maintainer="Lubomir Stanko " @@ -27,6 +27,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -125,10 +126,10 @@ RUN apt-get update && \ 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.19.3 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.24 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.20.0 && \ 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 redis-6.1.0 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ docker-php-ext-enable \ apcu \ @@ -147,15 +148,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# Php Security Checker binary package setup -RUN wget -q \ - 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 - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- @@ -163,7 +155,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.8 + --version=2.8.3 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -187,6 +179,7 @@ RUN curl -sS https://getcomposer.org/installer | \ # ---------------------------------------------------------------------------------------------------------------------- # VIPS ENVIRONMENT VARIABLES # Packages +ENV PHP_FFI_ENABLED=true ENV VIPS_BUILD_DEPS="automake \ build-essential \ libexpat1-dev \ @@ -212,6 +205,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libcfitsio-dev \ libcurl4-openssl-dev \ libexif-dev \ + libffi8 \ libfftw3-dev \ libfile-mimeinfo-perl \ libgif-dev \ @@ -219,9 +213,9 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libheif-dev \ libjpeg62-turbo \ libmatio11 \ - liborc-0.4-dev \ libopenexr-3-1-30 \ libopenslide-dev \ + liborc-0.4-dev \ libpango1.0-dev \ libpoppler-glib8 \ librsvg2-dev \ @@ -238,12 +232,15 @@ RUN DEBIAN_FRONTEND=noninteractive && \ apt-get install -y \ ${VIPS_BUILD_DEPS} \ ${VIPS_RUN_DEPS} && \ + docker-php-ext-configure ffi && \ + docker-php-ext-install -j$(nproc) \ + ffi && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.16.0/vips-8.16.0.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.3 && \ + cd vips-8.16.0 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ diff --git a/build/php82/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini b/build/php82/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini index 99031ee..c630589 100644 --- a/build/php82/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini +++ b/build/php82/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini @@ -1959,6 +1959,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/build/php83/cli/base/Dockerfile b/build/php83/cli/base/Dockerfile index c6f716d..08750d1 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.11-cli +FROM php:8.3.14-cli LABEL maintainer="Lubomir Stanko " @@ -27,6 +27,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -125,10 +126,10 @@ RUN apt-get update && \ 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.19.3 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.24 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.20.0 && \ 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 redis-6.1.0 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ docker-php-ext-enable \ apcu \ @@ -147,15 +148,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# Php Security Checker binary package setup -RUN wget -q \ - 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 - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- @@ -163,7 +155,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.8 + --version=2.8.3 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS diff --git a/build/php83/cli/base/usr/local/etc/php/php.ini b/build/php83/cli/base/usr/local/etc/php/php.ini index c454d9a..e7cd452 100644 --- a/build/php83/cli/base/usr/local/etc/php/php.ini +++ b/build/php83/cli/base/usr/local/etc/php/php.ini @@ -1966,6 +1966,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/build/php83/cli/vipsffmpeg/Dockerfile b/build/php83/cli/vipsffmpeg/Dockerfile index a9ffb8f..ea6e375 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.11-cli +FROM php:8.3.14-cli LABEL maintainer="Lubomir Stanko " @@ -27,6 +27,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -125,10 +126,10 @@ RUN apt-get update && \ 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.19.3 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.24 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.20.0 && \ 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 redis-6.1.0 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ docker-php-ext-enable \ apcu \ @@ -147,15 +148,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# Php Security Checker binary package setup -RUN wget -q \ - 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 - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- @@ -163,7 +155,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.8 + --version=2.8.3 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -187,6 +179,7 @@ RUN curl -sS https://getcomposer.org/installer | \ # ---------------------------------------------------------------------------------------------------------------------- # VIPS ENVIRONMENT VARIABLES # Packages +ENV PHP_FFI_ENABLED=true ENV VIPS_BUILD_DEPS="automake \ build-essential \ libexpat1-dev \ @@ -212,6 +205,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libcfitsio-dev \ libcurl4-openssl-dev \ libexif-dev \ + libffi8 \ libfftw3-dev \ libfile-mimeinfo-perl \ libgif-dev \ @@ -219,9 +213,9 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libheif-dev \ libjpeg62-turbo \ libmatio11 \ - liborc-0.4-dev \ libopenexr-3-1-30 \ libopenslide-dev \ + liborc-0.4-dev \ libpango1.0-dev \ libpoppler-glib8 \ librsvg2-dev \ @@ -238,12 +232,15 @@ RUN DEBIAN_FRONTEND=noninteractive && \ apt-get install -y \ ${VIPS_BUILD_DEPS} \ ${VIPS_RUN_DEPS} && \ + docker-php-ext-configure ffi && \ + docker-php-ext-install -j$(nproc) \ + ffi && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.16.0/vips-8.16.0.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.3 && \ + cd vips-8.16.0 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ diff --git a/build/php83/cli/vipsffmpeg/usr/local/etc/php/php.ini b/build/php83/cli/vipsffmpeg/usr/local/etc/php/php.ini index c454d9a..e7cd452 100644 --- a/build/php83/cli/vipsffmpeg/usr/local/etc/php/php.ini +++ b/build/php83/cli/vipsffmpeg/usr/local/etc/php/php.ini @@ -1966,6 +1966,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/build/php83/fpm/vipsffmpeg-nginx/Dockerfile b/build/php83/fpm/vipsffmpeg-nginx/Dockerfile index 3ce88a4..3856f8b 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.11-fpm +FROM php:8.3.14-fpm LABEL maintainer="Lubomir Stanko " @@ -27,6 +27,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -125,10 +126,10 @@ RUN apt-get update && \ 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.19.3 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install apcu-5.1.24 && \ + yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install mongodb-1.20.0 && \ 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 redis-6.1.0 && \ yes '' | MAKEFLAGS="-j$(($(nproc)+2))" pecl install xdebug-3.3.2 && \ docker-php-ext-enable \ apcu \ @@ -147,15 +148,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# Php Security Checker binary package setup -RUN wget -q \ - 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 - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- @@ -163,7 +155,7 @@ RUN curl -sS https://getcomposer.org/installer | \ php -- \ --install-dir=/usr/local/bin \ --filename=composer \ - --version=2.7.8 + --version=2.8.3 # ---------------------------------------------------------------------------------------------------------------------- # REDIS-TOOLS @@ -187,6 +179,7 @@ RUN curl -sS https://getcomposer.org/installer | \ # ---------------------------------------------------------------------------------------------------------------------- # VIPS ENVIRONMENT VARIABLES # Packages +ENV PHP_FFI_ENABLED=true ENV VIPS_BUILD_DEPS="automake \ build-essential \ libexpat1-dev \ @@ -212,6 +205,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libcfitsio-dev \ libcurl4-openssl-dev \ libexif-dev \ + libffi8 \ libfftw3-dev \ libfile-mimeinfo-perl \ libgif-dev \ @@ -219,9 +213,9 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libheif-dev \ libjpeg62-turbo \ libmatio11 \ - liborc-0.4-dev \ libopenexr-3-1-30 \ libopenslide-dev \ + liborc-0.4-dev \ libpango1.0-dev \ libpoppler-glib8 \ librsvg2-dev \ @@ -238,12 +232,15 @@ RUN DEBIAN_FRONTEND=noninteractive && \ apt-get install -y \ ${VIPS_BUILD_DEPS} \ ${VIPS_RUN_DEPS} && \ + docker-php-ext-configure ffi && \ + docker-php-ext-install -j$(nproc) \ + ffi && \ cd /tmp && \ wget -qc \ - https://github.com/libvips/libvips/releases/download/v8.15.3/vips-8.15.3.tar.xz \ + https://github.com/libvips/libvips/releases/download/v8.16.0/vips-8.16.0.tar.xz \ -O - | \ tar -xJ && \ - cd vips-8.15.3 && \ + cd vips-8.16.0 && \ meson setup release --libdir=lib --buildtype=release && \ cd release && \ meson compile && \ diff --git a/build/php83/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini b/build/php83/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini index c454d9a..e7cd452 100644 --- a/build/php83/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini +++ b/build/php83/fpm/vipsffmpeg-nginx/usr/local/etc/php/php.ini @@ -1966,6 +1966,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/config/all-8.2/usr/local/etc/php/php.ini b/config/all-8.2/usr/local/etc/php/php.ini index 99031ee..c630589 100644 --- a/config/all-8.2/usr/local/etc/php/php.ini +++ b/config/all-8.2/usr/local/etc/php/php.ini @@ -1959,6 +1959,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/config/all-8.3/usr/local/etc/php/php.ini b/config/all-8.3/usr/local/etc/php/php.ini index c454d9a..e7cd452 100644 --- a/config/all-8.3/usr/local/etc/php/php.ini +++ b/config/all-8.3/usr/local/etc/php/php.ini @@ -1966,6 +1966,7 @@ opcache.preload = ${PHP_OPCACHE_PRELOAD_PATH} ; "false" - always disabled ; "true" - always enabled ;ffi.enable=preload +ffi.enable=${PHP_FFI_ENABLED} ; List of headers files to preload, wildcard patterns allowed. ;ffi.preload= diff --git a/doc/PHP-Changelog/3.5.0.md b/doc/PHP-Changelog/3.5.0.md new file mode 100644 index 0000000..7c68413 --- /dev/null +++ b/doc/PHP-Changelog/3.5.0.md @@ -0,0 +1,19 @@ +2024-11-22 +=== + +### Added +- Installed new `ffi` php extension in `vipsffmpeg` image variant +- Added variable for php.ini config `ffi.enable` as `PHP_FFI_ENABLED` defaulted to `preload` for all variants except vipsffmpeg (defaulted to `true`) + +### Changed +- Docker packages update: + - php 8.2 `8.2.26` + - php 8.3 `8.3.14` + - php apcu ext `5.1.24` + - php mongodb ext `1.20.0` + - php redis ext `6.1.0` + - composer `2.8.3` + - libvips `8.16.0` + +### Removed +- Removed deprecated and orphan `local-php-security-checker` - use built in `composer audit` instead diff --git a/template.Dockerfile b/template.Dockerfile index 85694ef..a5e666b 100644 --- a/template.Dockerfile +++ b/template.Dockerfile @@ -21,6 +21,7 @@ ENV PHP_DATE_TIMEZONE="UTC" \ PHP_ERROR_LOG="/proc/self/fd/2" \ PHP_ERROR_REPORTING=6143 \ PHP_EXPOSE_PHP=0 \ + PHP_FFI_ENABLED="preload" \ PHP_LOG_LEVEL="notice" \ PHP_MAX_EXECUTION_TIME=30 \ PHP_MEMORY_LIMIT="256M" \ @@ -141,15 +142,6 @@ RUN apt-get update && \ apt-get clean && \ rm -r /var/lib/apt/lists/* -# ---------------------------------------------------------------------------------------------------------------------- -# PHP SECURITY CHECKER -# ---------------------------------------------------------------------------------------------------------------------- -# 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_linux_amd64 \ - -O /usr/local/bin/local-php-security-checker && \ - chmod +x /usr/local/bin/local-php-security-checker - # ---------------------------------------------------------------------------------------------------------------------- # COMPOSER # ---------------------------------------------------------------------------------------------------------------------- diff --git a/variant-vipsffmpeg.Dockerfile b/variant-vipsffmpeg.Dockerfile index 25234d2..ef9a7dc 100644 --- a/variant-vipsffmpeg.Dockerfile +++ b/variant-vipsffmpeg.Dockerfile @@ -4,6 +4,7 @@ # ---------------------------------------------------------------------------------------------------------------------- # VIPS ENVIRONMENT VARIABLES # Packages +ENV PHP_FFI_ENABLED=true ENV VIPS_BUILD_DEPS="automake \ build-essential \ libexpat1-dev \ @@ -29,6 +30,7 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libcfitsio-dev \ libcurl4-openssl-dev \ libexif-dev \ + libffi8 \ libfftw3-dev \ libfile-mimeinfo-perl \ libgif-dev \ @@ -36,9 +38,9 @@ ENV VIPS_RUN_DEPS="gobject-introspection \ libheif-dev \ libjpeg62-turbo \ libmatio11 \ - liborc-0.4-dev \ libopenexr-3-1-30 \ libopenslide-dev \ + liborc-0.4-dev \ libpango1.0-dev \ libpoppler-glib8 \ librsvg2-dev \ @@ -55,6 +57,9 @@ RUN DEBIAN_FRONTEND=noninteractive && \ apt-get install -y \ ${VIPS_BUILD_DEPS} \ ${VIPS_RUN_DEPS} && \ + docker-php-ext-configure ffi && \ + docker-php-ext-install -j$(nproc) \ + ffi && \ cd /tmp && \ wget -qc \ https://github.com/libvips/libvips/releases/download/v${LIBVIPS_VERSION}/vips-${LIBVIPS_VERSION}.tar.xz \ diff --git a/versions.conf b/versions.conf index 91ebec8..ba8484c 100644 --- a/versions.conf +++ b/versions.conf @@ -1,18 +1,16 @@ -export PHP82_VERSION=8.2.23 -export PHP83_VERSION=8.3.11 +export PHP82_VERSION=8.2.26 +export PHP83_VERSION=8.3.14 # Pecl ext versions -export PECL_APCU_VERSION=5.1.23 -export PECL_MONGODB_VERSION=1.19.3 +export PECL_APCU_VERSION=5.1.24 +export PECL_MONGODB_VERSION=1.20.0 export PECL_PCOV_VERSION=1.0.11 -export PECL_REDIS_VERSION=6.0.2 +export PECL_REDIS_VERSION=6.1.0 export PECL_VIPS_VERSION=1.0.13 export PECL_XDEBUG_VERSION=3.3.2 # Nginx version export NGINX_VERSION=1.26.2 -# Php Security Checker version -export PHP_SECURITY_CHECKER_VERSION=2.1.3 # Composer version -export COMPOSER_VERSION=2.7.8 +export COMPOSER_VERSION=2.8.3 # Redis version export REDIS_VERSION=7.2.4 # Supervisor version @@ -20,4 +18,4 @@ export SUPERVISOR_VERSION=4.2.5 # FFmpeg version export FFMPEG_VERSION=5.1.6 # Libvips version -export LIBVIPS_VERSION=8.15.3 +export LIBVIPS_VERSION=8.16.0