feat: switch to docker bake action

Repository now uses docker bake github action together with docker-bake.hcl

style: various fixes in yaml files

feat: added php 8.3 support

feat: separate workflow for image testing

Author: lotyp

CODE_OF_CONDUCT.md renamed to .github/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-lotyp7@gmail.com.
+the@wayof.dev.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/labeler.yml

@@ -5,10 +5,10 @@
 
 "type: documentation":
   - changed-files:
-    - any-glob-to-any-file: [ 'assets/**/*', '.github/*', './*.md' ]
+      - any-glob-to-any-file: ['assets/**/*', '.github/*.yml', './*.md']
 
 "type: maintenance":
   - changed-files:
-    - any-glob-to-any-file: [ '.github/workflows/*' ]
+      - any-glob-to-any-file: ['.github/workflows/*']
 
 ...

.github/workflows/build-latest.yml

@@ -1,5 +1,9 @@
 ---
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
 on:  # yamllint disable-line rule:truthy
   pull_request:
 

.github/workflows/build-release.yml

@@ -0,0 +1,106 @@
+---
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+    paths-ignore:
+      - '**.md'
+
+env:
+  DOCKER_NAMESPACE: wayofdev/php-dev
+  GHCR_NAMESPACE: ghcr.io/wayofdev/docker-php-dev
+
+name: 🧪 Test Docker images
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os_name: ["alpine"]
+        php_version: ["8.1", "8.2", "8.3"]
+        php_type: ["fpm", "cli", "supervisord"]
+        builder: [{arch: "amd64", os: "ubuntu-latest"}]
+    runs-on: ${{ matrix.builder.os }}
+    steps:
+
+      - name: 🌎 Set environment variables
+        run: |
+          php_version="${{ matrix.php_version }}"
+          tag="${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}-${{ matrix.builder.arch }}"
+          php_version_slug="${php_version//./}"
+          target="php-${php_version_slug}-${{ matrix.php_type }}-${{ matrix.os_name }}"
+          echo "TARGET=${target}" >> $GITHUB_ENV
+          echo "PLATFORM_CACHE_TAG=${tag}" >> $GITHUB_ENV
+
+      - name: 📦 Check out the codebase
+        uses: actions/checkout@v4.1.1
+
+      - name: 🛠️ Install goss and dgoss
+        uses: e1himself/goss-installation-action@v1.2.1
+        with:
+          version: v0.4.6
+
+      - name: 🤖 Generate dist files
+        run: ansible-playbook src/playbook.yml -l ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
+
+      - name: 🖥️ Setup docker QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: 🛠️ Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: "--debug"
+
+      - name: 🔑 Login to docker-hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: 🔑 Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🐳 Extract docker meta data
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.DOCKER_NAMESPACE }}
+            ${{ env.GHCR_NAMESPACE }}
+          tags: |
+            type=raw,event=branch,value=latest
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+          flavor: |
+            latest=false
+            prefix=${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}-
+
+      - name: 🧪 Bake image for testing
+        id: bake
+        uses: docker/bake-action@v4
+        with:
+          targets: ${{ env.TARGET }}
+          files: |
+            ./docker-bake.hcl
+            ${{ steps.meta.outputs.bake-file }}
+          set: |
+            *.tags=
+            *.platform=linux/${{ matrix.builder.arch }}
+            *.cache-from=type=gha,scope=build-${{ env.PLATFORM_CACHE_TAG }}
+            *.cache-to=type=gha,scope=build-${{ env.PLATFORM_CACHE_TAG }}
+            *.output=type=docker,"name=${{ env.DOCKER_NAMESPACE }},${{ env.GHCR_NAMESPACE }}",name-canonical=true,push=false
+
+      - name: 🧪 Test Docker image
+        run: |
+          export IMAGE_TEMPLATE=${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
+          export IMAGE_TAG=${{ env.DOCKER_NAMESPACE }}:latest
+          make test

.github/workflows/shellcheck.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 📦 Check out the codebase
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: 🚀 Generate dist files
         run: make generate

.github/workflows/test.yml

@@ -0,0 +1,7 @@
+---
+
+trustedRegistries:
+  - docker.io
+  - "*.gcr.io"
+
+...

.github/workflows/upload-assets.yml

@@ -2,29 +2,29 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: fix-encoding-pragma
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.31.0
+    rev: v1.35.1
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
         types: [file, yaml]
         entry: yamllint --strict
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: 3.2.2
+    rev: v3.21.3
     hooks:
       - id: commitizen
         stages:
           - commit-msg
 
   - repo: https://github.com/ansible/ansible-lint
-    rev: v6.16.0
+    rev: v24.2.1
     hooks:
       - id: ansible-lint
         entry: ansible-lint . --force-color

.hadolint.yaml

@@ -47,9 +47,7 @@ rules:
         require-starting-space: true
         min-spaces-from-content: 1
 
-    line-length:
-        max: 180
-        level: warning
+    line-length: disable
 
 yaml-files:
     - "*.yaml"

.pre-commit-config.yaml

@@ -137,4 +137,7 @@ lint-docker: ## Run hadolint linter over dist Dockerfiles
 	hadolint -V ./dist/dev/8.2-cli-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.2-fpm-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.2-fpm-supervisord/Dockerfile
+	hadolint -V ./dist/dev/8.3-cli-alpine/Dockerfile
+	hadolint -V ./dist/dev/8.3-fpm-alpine/Dockerfile
+	hadolint -V ./dist/dev/8.3-fpm-supervisord/Dockerfile
 .PHONY: lint-docker

.yamllint

@@ -4,7 +4,6 @@
 <img width="456" src="https://raw.githubusercontent.com/wayofdev/docker-php-dev/master/assets/logo.gh-light-mode-only.png#gh-light-mode-only">
 <img width="456" src="https://raw.githubusercontent.com/wayofdev/docker-php-dev/master/assets/logo.gh-dark-mode-only.png#gh-dark-mode-only">
 </div>
-
 <br>
 
 <br>
@@ -124,18 +123,15 @@ $ make
 Building all images:
 
 ```bash
-$ make build IMAGE_TEMPLATE="7.4-cli-alpine"
-$ make build IMAGE_TEMPLATE="7.4-fpm-alpine"
-$ make build IMAGE_TEMPLATE="7.4-supervisord-alpine"
-$ make build IMAGE_TEMPLATE="8.0-cli-alpine"
-$ make build IMAGE_TEMPLATE="8.0-fpm-alpine"
-$ make build IMAGE_TEMPLATE="8.0-supervisord-alpine"
 $ make build IMAGE_TEMPLATE="8.1-cli-alpine"
 $ make build IMAGE_TEMPLATE="8.1-fpm-alpine"
 $ 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>
@@ -153,18 +149,15 @@ $ make test
 To test all images:
 
 ```bash
-$ make test IMAGE_TEMPLATE="7.4-cli-alpine"
-$ make test IMAGE_TEMPLATE="7.4-fpm-alpine"
-$ make test IMAGE_TEMPLATE="7.4-supervisord-alpine"
-$ make test IMAGE_TEMPLATE="8.0-cli-alpine"
-$ make test IMAGE_TEMPLATE="8.0-fpm-alpine"
-$ make test IMAGE_TEMPLATE="8.0-supervisord-alpine"
 $ make test IMAGE_TEMPLATE="8.1-cli-alpine"
 $ make test IMAGE_TEMPLATE="8.1-fpm-alpine"
 $ 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>
@@ -189,6 +182,12 @@ Run ansible-lint to validate project files:
 $ make lint-ansible
 ```
 
+Run [dive](https://github.com/wagoodman/dive) command to analyze image:
+
+```bash
+$ make analyze
+```
+
 <br>
 
 ## 🤝 License
@@ -207,9 +206,4 @@ This repository was created in **2022** by [lotyp / wayofdev](https://github.com
 
 <img align="left" src="https://img.shields.io/github/contributors-anon/wayofdev/docker-php-dev?style=for-the-badge"/>
 
-<a href="https://github.com/wayofdev/docker-php-dev/graphs/contributors">
-  <img src="https://opencollective.com/wod/contributors.svg?width=890&button=false">
-</a>
-
 <br>
-