From ddaa117ace9da69b9aaffa481ab7e849df18ae5f Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Thu, 21 Nov 2024 09:36:01 -0600 Subject: [PATCH 1/3] prepare stable build --- README.md | 32 ++++++++++++++++---------------- coverage.php | 6 ++++-- matrix.php | 6 +++--- update-readme.php | 12 +++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index dbcf2de..62e9529 100644 --- a/README.md +++ b/README.md @@ -4,50 +4,50 @@ Development and Production-ready PHP Images for Docker **Special thanks to [@mlocati](https://github.com/mlocati) for creating the fantastic [`mlocati/docker-php-extension-installer`](https://github.com/mlocati/docker-php-extension-installer) tool, which made all of this possible!** -> **Supported versions: [`8.4-rc`](#-use-php-84-rc-image-in-dockerfile), [`8.3`](#-use-php-83-image-in-dockerfile), [`8.2`](#-use-php-82-image-in-dockerfile), [`8.1`](#-use-php-81-image-in-dockerfile), [`8.0`](#-use-php-80-image-in-dockerfile), [`7.4`](#-use-php-74-image-in-dockerfile), [`7.3`](#-use-php-73-image-in-dockerfile)** +> **Supported versions: [`8.4`](#-use-php-84-rc-image-in-dockerfile), [`8.3`](#-use-php-83-image-in-dockerfile), [`8.2`](#-use-php-82-image-in-dockerfile), [`8.1`](#-use-php-81-image-in-dockerfile), [`8.0`](#-use-php-80-image-in-dockerfile), [`7.4`](#-use-php-74-image-in-dockerfile), [`7.3`](#-use-php-73-image-in-dockerfile)** -### PHP 8.4-rc +### PHP 8.4 -#### ![Code](resource/icons/code.svg) Use `PHP 8.4-rc` image in Dockerfile +#### ![Code](resource/icons/code.svg) Use `PHP 8.4` image in Dockerfile ```Dockerfile -FROM ghcr.io/ghostwriter/php:8.4-rc # 8.4-rc-cli with additional development tools +FROM ghcr.io/ghostwriter/php:8.4 # 8.4-cli with additional development tools ``` ```Dockerfile -FROM ghcr.io/ghostwriter/php:8.4-rc-cli +FROM ghcr.io/ghostwriter/php:8.4-cli ``` ```Dockerfile -FROM ghcr.io/ghostwriter/php:8.4-rc-fpm +FROM ghcr.io/ghostwriter/php:8.4-fpm ``` ```Dockerfile -FROM ghcr.io/ghostwriter/php:8.4-rc-zts +FROM ghcr.io/ghostwriter/php:8.4-zts ``` -#### ![Terminal](resource/icons/terminal.svg) Pull & Run `PHP 8.4-rc` image from the command line +#### ![Terminal](resource/icons/terminal.svg) Pull & Run `PHP 8.4` image from the command line ```sh -docker pull ghcr.io/ghostwriter/php:8.4-rc +docker pull ghcr.io/ghostwriter/php:8.4 ``` ```sh -docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc vendor/bin/phpunit +docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4 vendor/bin/phpunit ``` ```sh -docker pull ghcr.io/ghostwriter/php:8.4-rc-cli +docker pull ghcr.io/ghostwriter/php:8.4-cli ``` ```sh -docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc-cli vendor/bin/phpunit +docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-cli vendor/bin/phpunit ``` ```sh -docker pull ghcr.io/ghostwriter/php:8.4-rc-fpm +docker pull ghcr.io/ghostwriter/php:8.4-fpm ``` ```sh -docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc-fpm vendor/bin/phpunit +docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-fpm vendor/bin/phpunit ``` ```sh -docker pull ghcr.io/ghostwriter/php:8.4-rc-zts +docker pull ghcr.io/ghostwriter/php:8.4-zts ``` ```sh -docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc-zts vendor/bin/phpunit +docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-zts vendor/bin/phpunit ``` diff --git a/coverage.php b/coverage.php index 4e7e519..39a571c 100644 --- a/coverage.php +++ b/coverage.php @@ -1,5 +1,7 @@ = 80400 + ? 'krakjoe/pcov@7d764c7c2555e8287351961d72be3ebec4d8743f' + : 'pcov'; -echo $phpVersion === '8.4' ? 'krakjoe/pcov@7d764c7c2555e8287351961d72be3ebec4d8743f' : 'pcov'; +echo $pcov; diff --git a/matrix.php b/matrix.php index 53aeff9..3dda31c 100644 --- a/matrix.php +++ b/matrix.php @@ -1,12 +1,12 @@ ['8.4-rc'], - 'latest' => ['8.3'], + 'dev' => ['master'], + 'latest' => ['8.4'], 'version' => \array_values($versions), 'variant' => ['cli', 'fpm', 'zts'], ]); diff --git a/update-readme.php b/update-readme.php index 3ca6cf4..540f388 100644 --- a/update-readme.php +++ b/update-readme.php @@ -2,20 +2,18 @@ declare(strict_types=1); -$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc']; +$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5-rc']; \arsort($versions); -$dev = '8.4-rc'; -$latest = '8.3'; - +$dev = '8.5-rc'; +$latest = '8.4'; $variants = ['cli', 'fpm', 'zts']; - $extensions = [ - // 'database' => ['pgsql'], + // 'database' => ['mysql','pgsql'], 'code-coverage' => ['pcov'], 'extension' => [ - // 'swoole', + // 'openswoole', // 'roadrunner', // 'frankenphp' ], From 674cf47e67e28e7c991ed5dc1c6f6360ae02e02a Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Thu, 21 Nov 2024 09:42:01 -0600 Subject: [PATCH 2/3] update next dev version --- update-readme.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-readme.php b/update-readme.php index 540f388..cf7d38c 100644 --- a/update-readme.php +++ b/update-readme.php @@ -2,11 +2,11 @@ declare(strict_types=1); -$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5-rc']; +$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', 'master']; \arsort($versions); -$dev = '8.5-rc'; +$dev = 'master'; $latest = '8.4'; $variants = ['cli', 'fpm', 'zts']; $extensions = [ From bae812b18f807e07f8eb0680b9dccf5701d03c74 Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Thu, 21 Nov 2024 12:21:18 -0600 Subject: [PATCH 3/3] Update readme Signed-off-by: Nathanael Esayeas --- README.md | 2 +- update-readme.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 62e9529..75beea5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Development and Production-ready PHP Images for Docker **Special thanks to [@mlocati](https://github.com/mlocati) for creating the fantastic [`mlocati/docker-php-extension-installer`](https://github.com/mlocati/docker-php-extension-installer) tool, which made all of this possible!** -> **Supported versions: [`8.4`](#-use-php-84-rc-image-in-dockerfile), [`8.3`](#-use-php-83-image-in-dockerfile), [`8.2`](#-use-php-82-image-in-dockerfile), [`8.1`](#-use-php-81-image-in-dockerfile), [`8.0`](#-use-php-80-image-in-dockerfile), [`7.4`](#-use-php-74-image-in-dockerfile), [`7.3`](#-use-php-73-image-in-dockerfile)** +> **Supported versions: [`8.4`](#-use-php-84-image-in-dockerfile), [`8.3`](#-use-php-83-image-in-dockerfile), [`8.2`](#-use-php-82-image-in-dockerfile), [`8.1`](#-use-php-81-image-in-dockerfile), [`8.0`](#-use-php-80-image-in-dockerfile), [`7.4`](#-use-php-74-image-in-dockerfile), [`7.3`](#-use-php-73-image-in-dockerfile)** ### PHP 8.4 diff --git a/update-readme.php b/update-readme.php index cf7d38c..b1ed1cd 100644 --- a/update-readme.php +++ b/update-readme.php @@ -2,11 +2,11 @@ declare(strict_types=1); -$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', 'master']; +$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']; \arsort($versions); -$dev = 'master'; +$dev = '8.5'; $latest = '8.4'; $variants = ['cli', 'fpm', 'zts']; $extensions = [