Skip to content

Commit

Permalink
feat: support for 8.3 php images
Browse files Browse the repository at this point in the history
  • Loading branch information
lotyp committed Jan 29, 2024
1 parent 4d096fb commit 5285434
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```

<br>
Expand Down Expand Up @@ -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"
```

<br>
Expand Down
22 changes: 22 additions & 0 deletions src/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

...

0 comments on commit 5285434

Please sign in to comment.