From 5601eb189c0d61afb34d114e92b059b32b5b08f4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Feb 2026 15:00:31 +0100 Subject: [PATCH 1/5] moving in wavelog docker image to php8.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 93afb73f9..14d4afb22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-apache +FROM php:8.4-apache ENV CI_ENV=docker COPY --from=ghcr.io/mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ From 7e4a525b11cb48183ab20deb14d8a5f12f91c2f6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Feb 2026 15:00:40 +0100 Subject: [PATCH 2/5] testing new action versions --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a69fedb82..69c8d9567 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -16,9 +16,9 @@ jobs: contents: read packages: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{github.actor}} @@ -33,7 +33,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64,linux/arm/v7 From dd0318e3a42f25d567b95e0fa61f052e665239fc Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Feb 2026 15:38:33 +0100 Subject: [PATCH 3/5] testing parallel build job --- .github/workflows/docker-image.yml | 115 ++++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 69c8d9567..ea7c66712 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -10,19 +10,52 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: - build: + build-amd64: runs-on: ubuntu-latest permissions: contents: read packages: write + outputs: + digest: ${{ steps.build.outputs.digest }} steps: - uses: actions/checkout@v6 - - name: 'Login to GitHub Container Registry' + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build and push (amd64) + id: build + uses: docker/build-push-action@v6 + with: + context: . + platforms: linux/amd64 + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true + labels: ${{ steps.meta.outputs.labels }} + + build-arm64: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + outputs: + digest: ${{ steps.build.outputs.digest }} + steps: + - uses: actions/checkout@v6 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta uses: docker/metadata-action@v5 @@ -32,11 +65,75 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build and push + - name: Build and push (arm64) + id: build uses: docker/build-push-action@v6 with: context: . - platforms: linux/amd64,linux/arm64,linux/arm/v7 - push: true - tags: ${{ steps.meta.outputs.tags }} + platforms: linux/arm64 + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true labels: ${{ steps.meta.outputs.labels }} + + build-armv7: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + outputs: + digest: ${{ steps.build.outputs.digest }} + steps: + - uses: actions/checkout@v6 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build and push (arm/v7) + id: build + uses: docker/build-push-action@v6 + with: + context: . + platforms: linux/arm/v7 + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true + labels: ${{ steps.meta.outputs.labels }} + + merge: + runs-on: ubuntu-latest + needs: + - build-amd64 + - build-arm64 + - build-armv7 + permissions: + contents: read + packages: write + steps: + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Create and push multi-arch manifest + run: | + docker buildx imagetools create \ + $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build-amd64.outputs.digest }} \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build-arm64.outputs.digest }} \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build-armv7.outputs.digest }} From 2b262f2f7ef8ef8e34818df80933538db0d8a4eb Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Feb 2026 15:44:43 +0100 Subject: [PATCH 4/5] repo name need to be lower case --- .github/workflows/docker-image.yml | 33 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ea7c66712..44cb8ba78 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -10,8 +10,18 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: + prepare: + runs-on: ubuntu-latest + outputs: + image_name: ${{ steps.lowercase.outputs.image_name }} + steps: + - name: Set lowercase image name + id: lowercase + run: echo "image_name=$(echo '${{ env.IMAGE_NAME }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT + build-amd64: runs-on: ubuntu-latest + needs: prepare permissions: contents: read packages: write @@ -29,7 +39,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Build and push (amd64) @@ -38,11 +48,12 @@ jobs: with: context: . platforms: linux/amd64 - outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true + outputs: type=image,name=${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true labels: ${{ steps.meta.outputs.labels }} build-arm64: runs-on: ubuntu-latest + needs: prepare permissions: contents: read packages: write @@ -60,7 +71,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -71,11 +82,12 @@ jobs: with: context: . platforms: linux/arm64 - outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true + outputs: type=image,name=${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true labels: ${{ steps.meta.outputs.labels }} build-armv7: runs-on: ubuntu-latest + needs: prepare permissions: contents: read packages: write @@ -93,7 +105,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -104,12 +116,13 @@ jobs: with: context: . platforms: linux/arm/v7 - outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true + outputs: type=image,name=${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true labels: ${{ steps.meta.outputs.labels }} merge: runs-on: ubuntu-latest needs: + - prepare - build-amd64 - build-arm64 - build-armv7 @@ -127,13 +140,13 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create and push multi-arch manifest run: | docker buildx imagetools create \ $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build-amd64.outputs.digest }} \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build-arm64.outputs.digest }} \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ needs.build-armv7.outputs.digest }} + ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }}@${{ needs.build-amd64.outputs.digest }} \ + ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }}@${{ needs.build-arm64.outputs.digest }} \ + ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }}@${{ needs.build-armv7.outputs.digest }} From cb91a924b6641f3964ee787a5e4295fdf7310f9f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 20 Feb 2026 15:54:08 +0100 Subject: [PATCH 5/5] let arm builds run on arm servers --- .github/workflows/docker-image.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 44cb8ba78..2bdc23d47 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -52,7 +52,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-arm64: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm needs: prepare permissions: contents: read @@ -72,8 +72,6 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ needs.prepare.outputs.image_name }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Build and push (arm64) @@ -86,7 +84,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} build-armv7: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm needs: prepare permissions: contents: read