diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41d6349..c3de871 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: @@ -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: diff --git a/Makefile b/Makefile index e1ae835..ac27cfa 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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/ . .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 @@ -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/ . .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/ . + +.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 diff --git a/extensions-builder.Dockerfile b/extensions-builder.Dockerfile index 5fc61d4..5e5555a 100644 --- a/extensions-builder.Dockerfile +++ b/extensions-builder.Dockerfile @@ -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 @@ -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 diff --git a/php/base.Dockerfile b/php/base.Dockerfile index 805cfb4..72f4257 100644 --- a/php/base.Dockerfile +++ b/php/base.Dockerfile @@ -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 @@ -27,6 +27,7 @@ RUN install-php-extensions \ iconv \ imagick \ intl \ + opentelemetry \ pdo_sqlite \ phar \ posix \ @@ -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 ENV PHP_MEMORY_LIMIT=512M ENV PHP_POST_MAX_SIZE=256M ENV PHP_UPLOAD_MAX_FILESIZE=256M diff --git a/php/common/usr/local/bin/docker-php-serversideup-setup b/php/common/usr/local/bin/docker-php-serversideup-setup index 5e0385d..8de0683 100644 --- a/php/common/usr/local/bin/docker-php-serversideup-setup +++ b/php/common/usr/local/bin/docker-php-serversideup-setup @@ -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