From ef9248a6c6d1a530fdd4674bd2cfe65055767259 Mon Sep 17 00:00:00 2001 From: Tim Weisenberger Date: Fri, 26 Jun 2026 10:08:44 +0200 Subject: [PATCH] feat: Use Ubuntu 26.04 LTS for php 8.5 containers --- .github/workflows/php.yml | 4 ++-- build-container.sh | 14 +++++++------- php/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index ce0d9708..3c172ef0 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -56,10 +56,10 @@ jobs: PHP_VERSION=8.4 UBUNTU_VERSION=24.04 - version: 8.5 - file: 8.x.Dockerfile + file: Dockerfile build-args: | PHP_VERSION=8.5 - UBUNTU_VERSION=24.04 + UBUNTU_VERSION=26.04 steps: - name: Checkout diff --git a/build-container.sh b/build-container.sh index 1e545f7c..004a25af 100755 --- a/build-container.sh +++ b/build-container.sh @@ -102,13 +102,13 @@ docker buildx build -t ghcr.io/netlogix/docker/php-cron:8.4 --build-arg PHP_VERS docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:8.4 --build-arg PHP_VERSION=8.4 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cron-dev php docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:8.4 --build-arg PHP_VERSION=8.4 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-supervisor php -docker buildx build -t ghcr.io/netlogix/docker/php-fpm:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-fpm php -docker buildx build -t ghcr.io/netlogix/docker/php-cli:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cli php -docker buildx build -t ghcr.io/netlogix/docker/php-fpm-dev:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-fpm-dev php -docker buildx build -t ghcr.io/netlogix/docker/php-cli-dev:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cli-dev php -docker buildx build -t ghcr.io/netlogix/docker/php-cron:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cron php -docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-cron-dev php -docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=24.04 -f php/8.x.Dockerfile --target=php-supervisor php +docker buildx build -t ghcr.io/netlogix/docker/php-fpm:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-fpm php +docker buildx build -t ghcr.io/netlogix/docker/php-cli:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-cli php +docker buildx build -t ghcr.io/netlogix/docker/php-fpm-dev:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-fpm-dev php +docker buildx build -t ghcr.io/netlogix/docker/php-cli-dev:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-cli-dev php +docker buildx build -t ghcr.io/netlogix/docker/php-cron:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-cron php +docker buildx build -t ghcr.io/netlogix/docker/php-cron-dev:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-cron-dev php +docker buildx build -t ghcr.io/netlogix/docker/php-supervisor:8.5 --build-arg PHP_VERSION=8.5 --build-arg UBUNTU_VERSION=26.04 -f php/Dockerfile --target=php-supervisor php docker buildx build -t ghcr.io/netlogix/docker/frankenphp:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp php docker buildx build -t ghcr.io/netlogix/docker/frankenphp-dev:8.3 --build-arg PHP_VERSION=8.3 -f php/frankenphp.Dockerfile --target=frankenphp-dev php diff --git a/php/Dockerfile b/php/Dockerfile index 06ef2f88..6b1c2c3b 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -90,7 +90,7 @@ RUN apt-get update && \ php${PHP_VERSION}-intl \ php${PHP_VERSION}-mbstring \ php${PHP_VERSION}-mysql \ - php${PHP_VERSION}-opcache \ + $(if dpkg --compare-versions "${PHP_VERSION}" lt "8.5"; then echo "php${PHP_VERSION}-opcache"; fi) \ php${PHP_VERSION}-pgsql \ php${PHP_VERSION}-raphf \ php${PHP_VERSION}-readline \