diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 873aad2..4a03bd6 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -20,7 +20,7 @@ jobs: run: | echo 'matrix={ "os_name": ["alpine"], - "php_version": ["8.1", "8.2"], + "php_version": ["8.1", "8.2", "8.3"], "php_type": ["fpm", "cli", "supervisord"] }' | tr -d '\n' >> $GITHUB_OUTPUT diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 57d7d17..8721a6a 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -20,7 +20,7 @@ jobs: run: | echo 'matrix={ "os_name": ["alpine"], - "php_version": ["8.1", "8.2"], + "php_version": ["8.1", "8.2", "8.3"], "php_type": ["fpm", "cli", "supervisord"] }' | tr -d '\n' >> $GITHUB_OUTPUT diff --git a/Makefile b/Makefile index 240dc2e..7aa9a8b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export DOCKER_BUILDKIT ?= 1 export COMPOSE_DOCKER_CLI_BUILD ?= 1 IMAGE_NAMESPACE ?= wayofdev/php-base -IMAGE_TEMPLATE ?= 8.2-fpm-alpine +IMAGE_TEMPLATE ?= 8.3-fpm-alpine IMAGE_TAG ?= $(IMAGE_NAMESPACE):$(IMAGE_TEMPLATE)-latest DOCKERFILE_DIR ?= ./dist/base/$(IMAGE_TEMPLATE) @@ -138,4 +138,7 @@ lint-docker: ## Run hadolint linter over dist Dockerfiles hadolint -V ./dist/base/8.2-cli-alpine/Dockerfile hadolint -V ./dist/base/8.2-fpm-alpine/Dockerfile hadolint -V ./dist/base/8.2-fpm-supervisord/Dockerfile + hadolint -V ./dist/base/8.3-cli-alpine/Dockerfile + hadolint -V ./dist/base/8.3-fpm-alpine/Dockerfile + hadolint -V ./dist/base/8.3-fpm-supervisord/Dockerfile .PHONY: lint-docker diff --git a/README.md b/README.md index 1182f27..d1cdaac 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,9 @@ $ make build IMAGE_TEMPLATE="8.1-supervisord-alpine" $ make build IMAGE_TEMPLATE="8.2-cli-alpine" $ make build IMAGE_TEMPLATE="8.2-fpm-alpine" $ make build IMAGE_TEMPLATE="8.2-supervisord-alpine" +$ make build IMAGE_TEMPLATE="8.3-cli-alpine" +$ make build IMAGE_TEMPLATE="8.3-fpm-alpine" +$ make build IMAGE_TEMPLATE="8.3-supervisord-alpine" ```
@@ -185,6 +188,9 @@ $ make test IMAGE_TEMPLATE="8.1-supervisord-alpine" $ make test IMAGE_TEMPLATE="8.2-cli-alpine" $ make test IMAGE_TEMPLATE="8.2-fpm-alpine" $ make test IMAGE_TEMPLATE="8.2-supervisord-alpine" +$ make test IMAGE_TEMPLATE="8.3-cli-alpine" +$ make test IMAGE_TEMPLATE="8.3-fpm-alpine" +$ make test IMAGE_TEMPLATE="8.3-supervisord-alpine" ```
diff --git a/src/inventory.yml b/src/inventory.yml index 9000698..0fdd792 100644 --- a/src/inventory.yml +++ b/src/inventory.yml @@ -92,5 +92,27 @@ all: php_type: supervisord os_name: alpine os_version: 3.18 + # PHP 8.3 + 8.3-cli-alpine: + ansible_connection: local + level: base + php_version: 8.3 + php_type: cli + os_name: alpine + os_version: 3.18 + 8.3-fpm-alpine: + ansible_connection: local + level: base + php_version: 8.3 + php_type: fpm + os_name: alpine + os_version: 3.18 + 8.3-supervisord-alpine: + ansible_connection: local + level: base + php_version: 8.3 + php_type: supervisord + os_name: alpine + os_version: 3.18 ...