From fcf6d17851c5e6a07962a2b36655870b503c2234 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Sat, 4 Oct 2025 16:49:56 +0100 Subject: [PATCH 1/2] feat: add PHP 8.3/8.4 Debian 13 (trixie) --- docker-compose.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3bdd206..9a50b69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,6 +46,16 @@ services: REDIS_VERSION: "7.2" BASEOS: bookworm + php83-fpm-trixie-base: + image: my127/php:8.3-fpm-trixie${TAG_SUFFIX:-} + build: + context: ./ + target: base + args: + VERSION: "8.3" + REDIS_VERSION: "7.4" + BASEOS: trixie + php84-fpm-bookworm-base: image: my127/php:8.4-fpm-bookworm${TAG_SUFFIX:-} build: @@ -56,6 +66,16 @@ services: REDIS_VERSION: "7.4" BASEOS: bookworm + php84-fpm-trixie-base: + image: my127/php:8.4-fpm-trixie${TAG_SUFFIX:-} + build: + context: ./ + target: base + args: + VERSION: "8.4" + REDIS_VERSION: "7.4" + BASEOS: trixie + # Console Images php81-fpm-bullseye-console: image: my127/php:8.1-fpm-bullseye-console${TAG_SUFFIX:-} @@ -112,6 +132,17 @@ services: REDIS_VERSION: "7.2" BASEOS: bookworm + php83-fpm-trixie-console: + image: my127/php:8.3-fpm-trixie-console${TAG_SUFFIX:-} + build: + context: ./ + target: console + args: + VERSION: "8.3" + COMPOSER_VERSION: "2.8.12" + REDIS_VERSION: "8.2" + BASEOS: trixie + php84-fpm-bookworm-console: image: my127/php:8.4-fpm-bookworm-console${TAG_SUFFIX:-} build: @@ -122,3 +153,14 @@ services: COMPOSER_VERSION: "2.8.12" REDIS_VERSION: "7.4" BASEOS: bookworm + + php84-fpm-trixie-console: + image: my127/php:8.4-fpm-trixie-console${TAG_SUFFIX:-} + build: + context: ./ + target: console + args: + VERSION: "8.4" + COMPOSER_VERSION: "2.8.12" + REDIS_VERSION: "8.2" + BASEOS: trixie From 100b8f612b20ca84f0247fe99cc673e89ccef135 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Sat, 4 Oct 2025 17:06:46 +0100 Subject: [PATCH 2/2] remove old PHP and distro extension overrides --- installer/base/extensions/gd.sh | 24 +++------- installer/base/extensions/protobuf.sh | 11 +---- installer/base/extensions/xdebug.sh | 10 +---- installer/bookworm/extensions/event.sh | 9 +--- installer/bullseye/extensions/event.sh | 9 +--- installer/buster/extensions/event.sh | 62 -------------------------- installer/buster/extensions/intl.sh | 34 -------------- 7 files changed, 10 insertions(+), 149 deletions(-) delete mode 100644 installer/buster/extensions/event.sh delete mode 100644 installer/buster/extensions/intl.sh diff --git a/installer/base/extensions/gd.sh b/installer/base/extensions/gd.sh index 2904702..32604ba 100644 --- a/installer/base/extensions/gd.sh +++ b/installer/base/extensions/gd.sh @@ -13,24 +13,12 @@ function compile_gd() { _gd_deps_build - case "$VERSION" in - "7.3") - docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ - --with-webp-dir=/usr/include/ \ - --with-xpm-dir=/usr/include/ - ;; - *) - docker-php-ext-configure gd \ - --enable-gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - --with-xpm - esac + docker-php-ext-configure gd \ + --enable-gd \ + --with-freetype \ + --with-jpeg \ + --with-webp \ + --with-xpm docker-php-ext-install gd diff --git a/installer/base/extensions/protobuf.sh b/installer/base/extensions/protobuf.sh index 85527d3..50a5c84 100644 --- a/installer/base/extensions/protobuf.sh +++ b/installer/base/extensions/protobuf.sh @@ -11,14 +11,5 @@ function install_protobuf() function compile_protobuf() { - case "$VERSION" in - 7.*) - printf "\n" | pecl install protobuf-3.20.3 - ;; - 8.0) - printf "\n" | pecl install protobuf-3.25.3 - ;; - *) - printf "\n" | pecl install protobuf - esac + printf "\n" | pecl install protobuf } diff --git a/installer/base/extensions/xdebug.sh b/installer/base/extensions/xdebug.sh index 97727e8..b4efd78 100755 --- a/installer/base/extensions/xdebug.sh +++ b/installer/base/extensions/xdebug.sh @@ -13,13 +13,5 @@ function compile_xdebug() ( set -o errexit -o pipefail - case "$VERSION" in - 7.*) - XDEBUG_PACKAGE="xdebug-2.9.8" - printf "\n" | pecl install "$XDEBUG_PACKAGE" - ;; - *) - XDEBUG_PACKAGE="xdebug" - printf "\n" | pecl install "$XDEBUG_PACKAGE" - esac + printf "\n" | pecl install xdebug ) diff --git a/installer/bookworm/extensions/event.sh b/installer/bookworm/extensions/event.sh index 41f8bbe..e902407 100644 --- a/installer/bookworm/extensions/event.sh +++ b/installer/bookworm/extensions/event.sh @@ -15,14 +15,7 @@ function compile_event() { _event_deps_build - local PACKAGE_NAME="event" - case "$VERSION" in - "8.0") - PACKAGE_NAME="event-3.0.2" - ;; - esac - - if ! printf "\n" | pecl install "$PACKAGE_NAME"; then + if ! printf "\n" | pecl install event; then return 1 fi diff --git a/installer/bullseye/extensions/event.sh b/installer/bullseye/extensions/event.sh index 41f8bbe..e902407 100644 --- a/installer/bullseye/extensions/event.sh +++ b/installer/bullseye/extensions/event.sh @@ -15,14 +15,7 @@ function compile_event() { _event_deps_build - local PACKAGE_NAME="event" - case "$VERSION" in - "8.0") - PACKAGE_NAME="event-3.0.2" - ;; - esac - - if ! printf "\n" | pecl install "$PACKAGE_NAME"; then + if ! printf "\n" | pecl install event; then return 1 fi diff --git a/installer/buster/extensions/event.sh b/installer/buster/extensions/event.sh deleted file mode 100644 index 460b74c..0000000 --- a/installer/buster/extensions/event.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -function install_event() -{ - if ! has_extension event; then - compile_event - fi - - _event_deps_runtime - - docker-php-ext-enable --ini-name zz-docker-php-ext-event.ini event -} - -function compile_event() -{ - _event_deps_build - - local PACKAGE_NAME="event" - case "$VERSION" in - "8.0") - PACKAGE_NAME="event-3.0.2" - ;; - esac - - if ! printf "\n" | pecl install "$PACKAGE_NAME"; then - return 1 - fi - - _event_clean -} - -function _event_deps_runtime() -{ - enable \ - sockets - - install \ - libevent-2.1-6 \ - libevent-extra-2.1-6 \ - libevent-openssl-2.1-6 -} - -function _event_deps_build() -{ - enable \ - sockets - - install \ - libevent-dev \ - libssl-dev -} - -function _event_clean() -{ - remove \ - libevent-dev \ - libssl-dev - - if [ -f "/usr/local/etc/php/conf.d/docker-php-ext-sockets.ini" ]; then - rm "/usr/local/etc/php/conf.d/docker-php-ext-sockets.ini" - fi -} diff --git a/installer/buster/extensions/intl.sh b/installer/buster/extensions/intl.sh deleted file mode 100644 index 5e686a1..0000000 --- a/installer/buster/extensions/intl.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -function install_intl() -{ - _intl_deps_runtime - if ! has_extension intl; then - compile_intl - fi - docker-php-ext-enable intl -} - -function compile_intl() -{ - _intl_deps_build - - docker-php-ext-install intl - - _intl_clean -} - -function _intl_deps_runtime() -{ - install libicu63 -} - -function _intl_deps_build() -{ - install icu-devtools libicu-dev -} - -function _intl_clean() -{ - remove icu-devtools libicu-dev -}