diff --git a/php/base.Dockerfile b/php/base.Dockerfile index 60c7875..a4b142a 100644 --- a/php/base.Dockerfile +++ b/php/base.Dockerfile @@ -1,12 +1,13 @@ # syntax=docker/dockerfile:1 ARG PHP_VERSION=8.4 -ARG IMAGE_VERSION=v4.3.3 +ARG IMAGE_VERSION=v4.4.0 # Use 'debian' or 'alpine' ARG OS=debian # Use 'fpm' or 'frankenphp' ARG VARIANT=fpm -ARG SUPERCRONIC_VERSION=v0.2.42 +ARG SUPERCRONIC_VERSION=v0.2.45 +ARG PIE_VERSION=1.4.4 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 @@ -33,6 +34,11 @@ RUN install-php-extensions \ xsl \ uv +ARG PIE_VERSION +RUN curl -fL https://github.com/php/pie/releases/download/${PIE_VERSION}/pie.phar -o /usr/local/bin/pie \ + && chmod +x /usr/local/bin/pie \ + && pie -V + RUN ln -s $(php-config --extension-dir) /usr/local/lib/php/extensions/current # Don't install recommended packages to keep image size down diff --git a/php/common/usr/local/bin/docker-php-serversideup-setup b/php/common/usr/local/bin/docker-php-serversideup-setup index 8de0683..4442c8d 100644 --- a/php/common/usr/local/bin/docker-php-serversideup-setup +++ b/php/common/usr/local/bin/docker-php-serversideup-setup @@ -24,15 +24,7 @@ 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-${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 +pie install bsn4/grpc echo "🤖 Installing supercronic..."