From 826352aea2188fd52f2f0c7b404f3b7319240f7d Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 25 Nov 2024 19:29:48 +0200 Subject: [PATCH] Add initial PHP 8.4 support --- 8.4/cli-alpine-pcov/Dockerfile | 40 +++++++++++++++++++ 8.4/cli-alpine-pcov/conf.d/php.overrides.ini | 2 + 8.4/cli-alpine-xdebug/Dockerfile | 40 +++++++++++++++++++ .../conf.d/php.overrides.ini | 2 + 8.4/cli-alpine/Dockerfile | 38 ++++++++++++++++++ 8.4/cli-alpine/conf.d/php.overrides.ini | 2 + 8.4/fpm-alpine-pcov/Dockerfile | 40 +++++++++++++++++++ 8.4/fpm-alpine-pcov/conf.d/php.overrides.ini | 2 + 8.4/fpm-alpine-xdebug/Dockerfile | 40 +++++++++++++++++++ .../conf.d/php.overrides.ini | 2 + 8.4/fpm-alpine/Dockerfile | 38 ++++++++++++++++++ 8.4/fpm-alpine/conf.d/php.overrides.ini | 2 + versions.json | 12 ++++++ versions.php | 3 +- 14 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 8.4/cli-alpine-pcov/Dockerfile create mode 100644 8.4/cli-alpine-pcov/conf.d/php.overrides.ini create mode 100644 8.4/cli-alpine-xdebug/Dockerfile create mode 100644 8.4/cli-alpine-xdebug/conf.d/php.overrides.ini create mode 100644 8.4/cli-alpine/Dockerfile create mode 100644 8.4/cli-alpine/conf.d/php.overrides.ini create mode 100644 8.4/fpm-alpine-pcov/Dockerfile create mode 100644 8.4/fpm-alpine-pcov/conf.d/php.overrides.ini create mode 100644 8.4/fpm-alpine-xdebug/Dockerfile create mode 100644 8.4/fpm-alpine-xdebug/conf.d/php.overrides.ini create mode 100644 8.4/fpm-alpine/Dockerfile create mode 100644 8.4/fpm-alpine/conf.d/php.overrides.ini diff --git a/8.4/cli-alpine-pcov/Dockerfile b/8.4/cli-alpine-pcov/Dockerfile new file mode 100644 index 0000000..647cabb --- /dev/null +++ b/8.4/cli-alpine-pcov/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM php:8.4.1-cli-alpine + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + libxml2-dev \ + linux-headers \ + && apk add --no-cache --virtual .runtime-deps \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libzip-dev \ + icu-dev \ + && pecl install \ + redis \ + pcov \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-configure intl \ + && docker-php-ext-install \ + --jobs 4 \ + bcmath \ + gd \ + opcache \ + pdo_mysql \ + sockets \ + zip \ + intl \ + && docker-php-ext-enable \ + redis \ + pcov \ + && apk del .build-deps \ + && docker-php-source delete \ + && pecl clear-cache + +COPY conf.d/php.overrides.ini $PHP_INI_DIR/conf.d diff --git a/8.4/cli-alpine-pcov/conf.d/php.overrides.ini b/8.4/cli-alpine-pcov/conf.d/php.overrides.ini new file mode 100644 index 0000000..a82cd83 --- /dev/null +++ b/8.4/cli-alpine-pcov/conf.d/php.overrides.ini @@ -0,0 +1,2 @@ +[PHP] +expose_php = Off diff --git a/8.4/cli-alpine-xdebug/Dockerfile b/8.4/cli-alpine-xdebug/Dockerfile new file mode 100644 index 0000000..745c2c3 --- /dev/null +++ b/8.4/cli-alpine-xdebug/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM php:8.4.1-cli-alpine + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + libxml2-dev \ + linux-headers \ + && apk add --no-cache --virtual .runtime-deps \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libzip-dev \ + icu-dev \ + && pecl install \ + redis \ + xdebug \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-configure intl \ + && docker-php-ext-install \ + --jobs 4 \ + bcmath \ + gd \ + opcache \ + pdo_mysql \ + sockets \ + zip \ + intl \ + && docker-php-ext-enable \ + redis \ + xdebug \ + && apk del .build-deps \ + && docker-php-source delete \ + && pecl clear-cache + +COPY conf.d/php.overrides.ini $PHP_INI_DIR/conf.d diff --git a/8.4/cli-alpine-xdebug/conf.d/php.overrides.ini b/8.4/cli-alpine-xdebug/conf.d/php.overrides.ini new file mode 100644 index 0000000..a82cd83 --- /dev/null +++ b/8.4/cli-alpine-xdebug/conf.d/php.overrides.ini @@ -0,0 +1,2 @@ +[PHP] +expose_php = Off diff --git a/8.4/cli-alpine/Dockerfile b/8.4/cli-alpine/Dockerfile new file mode 100644 index 0000000..14ee1c9 --- /dev/null +++ b/8.4/cli-alpine/Dockerfile @@ -0,0 +1,38 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM php:8.4.1-cli-alpine + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + libxml2-dev \ + linux-headers \ + && apk add --no-cache --virtual .runtime-deps \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libzip-dev \ + icu-dev \ + && pecl install \ + redis \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-configure intl \ + && docker-php-ext-install \ + --jobs 4 \ + bcmath \ + gd \ + opcache \ + pdo_mysql \ + sockets \ + zip \ + intl \ + && docker-php-ext-enable \ + redis \ + && apk del .build-deps \ + && docker-php-source delete \ + && pecl clear-cache + +COPY conf.d/php.overrides.ini $PHP_INI_DIR/conf.d diff --git a/8.4/cli-alpine/conf.d/php.overrides.ini b/8.4/cli-alpine/conf.d/php.overrides.ini new file mode 100644 index 0000000..a82cd83 --- /dev/null +++ b/8.4/cli-alpine/conf.d/php.overrides.ini @@ -0,0 +1,2 @@ +[PHP] +expose_php = Off diff --git a/8.4/fpm-alpine-pcov/Dockerfile b/8.4/fpm-alpine-pcov/Dockerfile new file mode 100644 index 0000000..1d72390 --- /dev/null +++ b/8.4/fpm-alpine-pcov/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM php:8.4.1-fpm-alpine + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + libxml2-dev \ + linux-headers \ + && apk add --no-cache --virtual .runtime-deps \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libzip-dev \ + icu-dev \ + && pecl install \ + redis \ + pcov \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-configure intl \ + && docker-php-ext-install \ + --jobs 4 \ + bcmath \ + gd \ + opcache \ + pdo_mysql \ + sockets \ + zip \ + intl \ + && docker-php-ext-enable \ + redis \ + pcov \ + && apk del .build-deps \ + && docker-php-source delete \ + && pecl clear-cache + +COPY conf.d/php.overrides.ini $PHP_INI_DIR/conf.d diff --git a/8.4/fpm-alpine-pcov/conf.d/php.overrides.ini b/8.4/fpm-alpine-pcov/conf.d/php.overrides.ini new file mode 100644 index 0000000..a82cd83 --- /dev/null +++ b/8.4/fpm-alpine-pcov/conf.d/php.overrides.ini @@ -0,0 +1,2 @@ +[PHP] +expose_php = Off diff --git a/8.4/fpm-alpine-xdebug/Dockerfile b/8.4/fpm-alpine-xdebug/Dockerfile new file mode 100644 index 0000000..ca8f052 --- /dev/null +++ b/8.4/fpm-alpine-xdebug/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM php:8.4.1-fpm-alpine + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + libxml2-dev \ + linux-headers \ + && apk add --no-cache --virtual .runtime-deps \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libzip-dev \ + icu-dev \ + && pecl install \ + redis \ + xdebug \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-configure intl \ + && docker-php-ext-install \ + --jobs 4 \ + bcmath \ + gd \ + opcache \ + pdo_mysql \ + sockets \ + zip \ + intl \ + && docker-php-ext-enable \ + redis \ + xdebug \ + && apk del .build-deps \ + && docker-php-source delete \ + && pecl clear-cache + +COPY conf.d/php.overrides.ini $PHP_INI_DIR/conf.d diff --git a/8.4/fpm-alpine-xdebug/conf.d/php.overrides.ini b/8.4/fpm-alpine-xdebug/conf.d/php.overrides.ini new file mode 100644 index 0000000..a82cd83 --- /dev/null +++ b/8.4/fpm-alpine-xdebug/conf.d/php.overrides.ini @@ -0,0 +1,2 @@ +[PHP] +expose_php = Off diff --git a/8.4/fpm-alpine/Dockerfile b/8.4/fpm-alpine/Dockerfile new file mode 100644 index 0000000..b5ccda8 --- /dev/null +++ b/8.4/fpm-alpine/Dockerfile @@ -0,0 +1,38 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM php:8.4.1-fpm-alpine + +RUN apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + libxml2-dev \ + linux-headers \ + && apk add --no-cache --virtual .runtime-deps \ + freetype-dev \ + libjpeg-turbo-dev \ + libpng-dev \ + libzip-dev \ + icu-dev \ + && pecl install \ + redis \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-configure intl \ + && docker-php-ext-install \ + --jobs 4 \ + bcmath \ + gd \ + opcache \ + pdo_mysql \ + sockets \ + zip \ + intl \ + && docker-php-ext-enable \ + redis \ + && apk del .build-deps \ + && docker-php-source delete \ + && pecl clear-cache + +COPY conf.d/php.overrides.ini $PHP_INI_DIR/conf.d diff --git a/8.4/fpm-alpine/conf.d/php.overrides.ini b/8.4/fpm-alpine/conf.d/php.overrides.ini new file mode 100644 index 0000000..a82cd83 --- /dev/null +++ b/8.4/fpm-alpine/conf.d/php.overrides.ini @@ -0,0 +1,2 @@ +[PHP] +expose_php = Off diff --git a/versions.json b/versions.json index 84870ae..88ae3ac 100644 --- a/versions.json +++ b/versions.json @@ -13,6 +13,18 @@ }, "8.3": { "version": "8.3.14", + "latest": false, + "variants": [ + "fpm-alpine", + "fpm-alpine-xdebug", + "fpm-alpine-pcov", + "cli-alpine", + "cli-alpine-xdebug", + "cli-alpine-pcov" + ] + }, + "8.4": { + "version": "8.4.1", "latest": true, "variants": [ "fpm-alpine", diff --git a/versions.php b/versions.php index 59ba988..d3d3f77 100755 --- a/versions.php +++ b/versions.php @@ -8,9 +8,10 @@ const VERSIONS = [ '8.2', '8.3', + '8.4', ]; -const LATEST = '8.3'; +const LATEST = '8.4'; // Must be implemented in Dockerfile.template const DISTROS = [