Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.3", "8.4"]
php: ["8.3", "8.4", "8.5"]
os: ["alpine", "debian"]
variant: ["fpm", "frankenphp"]
exclude:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

strategy:
matrix:
php: ["8.3", "8.4"]
php: ["8.3", "8.4", "8.5"]
variant: ["fpm-debian", "fpm-alpine", "frankenphp-debian"]

steps:
Expand Down
27 changes: 22 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.PHONY: extensions
extensions: extensions/8.3 extensions/8.4
extensions: extensions/8.3 extensions/8.4 extensions/8.5

.PHONY: extensions/8.3
extensions/8.3: extensions/8.3/amd64 extensions/8.3/arm64
Expand All @@ -9,14 +9,14 @@ extensions/8.3/amd64:
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.3 -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.3-zts -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.3 --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.3-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
# docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.3-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
Comment on lines 9 to +12
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alpine ZTS extension build command is now commented out for 8.3. If ZTS+alpine images (or extension assets) are still supported, this will stop producing the required artifacts and the runtime grpc download may fail. If ZTS+alpine is intentionally unsupported, consider removing the dead targets (or adding an explicit comment explaining why they are disabled) to avoid confusion.

Copilot uses AI. Check for mistakes.

.PHONY: extensions/8.3/arm64
extensions/8.3/arm64:
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.3 -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.3-zts -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.3 --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.3-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
# docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.3-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .

.PHONY: extensions/8.4
extensions/8.4: extensions/8.4/amd64 extensions/8.4/arm64
Expand All @@ -26,14 +26,31 @@ extensions/8.4/amd64:
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.4 -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.4-zts -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.4 --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.4-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
# docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.4-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
Comment on lines 26 to +29
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alpine ZTS extension build command is now commented out for 8.4. If ZTS+alpine artifacts are still expected, this will leave missing grpc assets for that matrix. If it's intentionally disabled, please add a brief rationale or remove the commented command to keep the Makefile unambiguous.

Copilot uses AI. Check for mistakes.

.PHONY: extensions/8.4/arm64
extensions/8.4/arm64:
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.4 -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.4-zts -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.4 --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.4-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
# docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.4-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .

.PHONY: extensions/8.5
extensions/8.5: extensions/8.5/amd64 extensions/8.5/arm64

.PHONY: extensions/8.5/amd64
extensions/8.5/amd64:
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.5 -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.5-zts -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.5 --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
# docker buildx build --pull --platform=linux/amd64 --build-arg PHP_VERSION=8.5-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
Comment on lines +43 to +46
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alpine ZTS extension build command is commented out for the new 8.5 targets. Either restore the build if ZTS+alpine is supported, or explicitly document/remove the ZTS+alpine targets so users don't assume those assets are being produced.

Copilot uses AI. Check for mistakes.

.PHONY: extensions/8.5/arm64
extensions/8.5/arm64:
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.5 -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.5-zts -f extensions-builder.Dockerfile -o=./assets/extensions/ .
docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.5 --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .
# docker buildx build --pull --platform=linux/arm64 --build-arg PHP_VERSION=8.5-zts --build-arg OS_VARIANT=alpine -f extensions-builder.Dockerfile -o=./assets/extensions/ .


# Nome del bucket su S3 e la directory locale
Expand Down
4 changes: 2 additions & 2 deletions extensions-builder.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ARG PHP_VERSION=8.4
ARG OS_VARIANT=debian
ARG GRPC_VERSION=1.74.0
ARG GRPC_VERSION=1.78.0

FROM php:${PHP_VERSION}-alpine AS base_alpine
FROM php:${PHP_VERSION}-trixie AS base_debian
Expand All @@ -13,7 +13,7 @@ ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/relea
ARG GRPC_VERSION
RUN install-php-extensions grpc-${GRPC_VERSION}
RUN mkdir -p /output \
&& cp -r $(php-config --extension-dir)/grpc.so /output
&& cp -r $(php-config --extension-dir)/grpc.so /output/grpc-${GRPC_VERSION}.so

FROM scratch
ARG PHP_VERSION
Expand Down
7 changes: 4 additions & 3 deletions php/base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# syntax=docker/dockerfile:1

ARG PHP_VERSION=8.4
ARG IMAGE_VERSION=v4.3.0
ARG IMAGE_VERSION=v4.3.2
# Use 'debian' or 'alpine'
ARG OS=debian
# Use 'fpm' or 'frankenphp'
ARG VARIANT=fpm
ARG SUPERCRONIC_VERSION=v0.2.41
ARG SUPERCRONIC_VERSION=v0.2.42

FROM serversideup/php:${PHP_VERSION}-fpm-nginx-${OS}-${IMAGE_VERSION} AS base_fpm
FROM serversideup/php:${PHP_VERSION}-frankenphp-${OS}-${IMAGE_VERSION} AS base_frankenphp
Expand All @@ -27,6 +27,7 @@ RUN install-php-extensions \
iconv \
imagick \
intl \
opentelemetry \
pdo_sqlite \
Comment on lines 27 to 31
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is titled "Php 8.5", but it also adds the opentelemetry extension (and changes other runtime defaults). Consider updating the PR title/description or splitting these unrelated changes so it's clear what consumers should expect when upgrading.

Copilot uses AI. Check for mistakes.
phar \
posix \
Expand Down Expand Up @@ -72,7 +73,7 @@ ENV PHP_OPCACHE_JIT=on
ENV PHP_OPCACHE_JIT_BUFFER_SIZE=100M
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS=0
ENV PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16
ENV PHP_MAX_EXECUTION_TIME=900
ENV PHP_MAX_EXECUTION_TIME=55
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PHP_MAX_EXECUTION_TIME is reduced from 900 to 55 seconds. This is a behavior change that can break long-running requests/CLI tasks (e.g., artisan commands, migrations, queue workers) for existing users of this image. If this is intentional, consider documenting the rationale and/or making it configurable per image/tag instead of changing the default so drastically.

Copilot uses AI. Check for mistakes.
ENV PHP_MEMORY_LIMIT=512M
ENV PHP_POST_MAX_SIZE=256M
ENV PHP_UPLOAD_MAX_FILESIZE=256M
3 changes: 2 additions & 1 deletion php/common/usr/local/bin/docker-php-serversideup-setup
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ fi


echo "🤖 Installing grpc extension..."
GRPC_VERSION=1.78.0
PHP_EXTENSION_VERSION=$PHP_VERSION
if php -r 'exit(defined("PHP_ZTS") && PHP_ZTS ? 0 : 1);'; then
PHP_EXTENSION_VERSION="${PHP_VERSION}-zts"
fi
curl -fsSL -o grpc.so "https://s3.eu-central-1.amazonaws.com/docker-php-assets.keepsuit.com/extensions/${PHP_EXTENSION_VERSION}/${OS}/${TARGETARCH}/grpc.so"
curl -fsSL -o grpc.so "https://s3.eu-central-1.amazonaws.com/docker-php-assets.keepsuit.com/extensions/${PHP_EXTENSION_VERSION}/${OS}/${TARGETARCH}/grpc-${GRPC_VERSION}.so"
PHP_EXTENSION_DIR=$(php-config --extension-dir)
mv grpc.so ${PHP_EXTENSION_DIR}/grpc.so
PHPIZE_DEPS="" docker-php-ext-enable grpc
Expand Down