From b7d1ae261962230ffba0247ff79f34c279826f91 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Tue, 11 Aug 2026 20:42:23 +0300 Subject: [PATCH 01/11] cicd: add matrix dimension for runners and platform --- .../docker-images-build-and-push.yaml | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index f3abd2b..8ce46de 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -13,8 +13,6 @@ env: jobs: build-and-push: - runs-on: ubuntu-latest - permissions: contents: read packages: write @@ -26,6 +24,13 @@ jobs: dockerfile: ./Dockerfile - name: migrate dockerfile: ./Dockerfile.migrate + platform: + - name: linux/amd64 + runner: ubuntu-24.04 + - name: linux/arm64 + runner: ubuntu-24.04-arm + + runs-on: ${{ matrix.image.runner }} steps: - name: Checkout @@ -56,19 +61,24 @@ jobs: uses: docker/metadata-action@v6 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image.name }} - tags: | - type=raw,value=development,enable=${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }} - type=raw,value=latest,enable={{is_default_branch}} - type=ref,event=branch - type=sha,format=short + # tags: | + # type=raw,value=development,enable=${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }} + # type=raw,value=latest,enable={{is_default_branch}} + # type=ref,event=branch + # type=sha,format=short - name: Build and push + id: build uses: docker/build-push-action@v7 with: context: . file: ${{ matrix.image.dockerfile }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha,scope=${{ matrix.image.name }} - cache-to: type=gha,scope=${{ matrix.image.name }},mode=max - push: ${{ github.event_name == 'push' }} \ No newline at end of file + cache-from: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }} + cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max + push: ${{ github.event_name == 'push' }} + platform: ${{ matrix.platform.name }} + + outputs: + image-digest: ${{ steps.build.outputs.digest }} \ No newline at end of file From 2377883a394b7417c023832b27513c6ef84ff2a7 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:22:47 +0300 Subject: [PATCH 02/11] cicd: add manifests merging job --- .../docker-images-build-and-push.yaml | 84 +++++++++++++++++-- 1 file changed, 77 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index 8ce46de..0bf3928 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -61,11 +61,6 @@ jobs: uses: docker/metadata-action@v6 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image.name }} - # tags: | - # type=raw,value=development,enable=${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }} - # type=raw,value=latest,enable={{is_default_branch}} - # type=ref,event=branch - # type=sha,format=short - name: Build and push id: build @@ -78,7 +73,82 @@ jobs: cache-from: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }} cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max push: ${{ github.event_name == 'push' }} + outputs: push-by-digest=true,name-canonical=true platform: ${{ matrix.platform.name }} + + - name: Export digest + run: | + mkdir -p ${{ runner.temp }}/digests + digest="${{ steps.build.outputs.digest }}" + touch "${{ runner.temp }}/digests/${digest#sha256:}" + + - name: Upload digest artifact + uses: actions/upload-artifact@v4 + with: + name: digests-${{ matrix.image.name }}-${{ matrix.platform.name }} + path: ${{ runner.temp }}/digests/* + if-no-files-found: error + retention-days: 1 + + + merge-manifests: + name: Merge manifests + + runs-on: ubuntu-latest + + if: github.event_name == 'push' - outputs: - image-digest: ${{ steps.build.outputs.digest }} \ No newline at end of file + needs: build-and-push + + strategy: + matrix: + image: + - name: app + - name: migrate + + steps: + - name: Download all digests + uses: actions/download-artifact@v4 + with: + pattern: digests-${{ matrix.image.name }}-* + merge-multiple: true + path: ${{ runner.temp }}/digests + + - name: Extract metadata + id: meta + uses: docker/metadata-action@v6 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image.name }} + tags: | + type=raw,value=development,enable=${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }} + type=raw,value=latest,enable={{is_default_branch}} + type=ref,event=branch + type=sha,format=short + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v4 + + - name: Log in to GHCR + if: env.REGISTRY == 'ghcr.io' && github.event_name == 'push' + uses: docker/login-action@v4 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Optional generic registry login for non-GHCR + - name: Log in to external registry + if: env.REGISTRY != 'ghcr.io' && github.event_name == 'push' + uses: docker/login-action@v4 + with: + registry: ${{ env.REGISTRY }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Merge manifests + working-directory: ${{ runner.temp }}/digests + run: | + docker buildx imagetools create \ + $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image.name }}@sha256:%s ' *) + From 9efdec5f336280128c7710a18b901ebc958d2ebf Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:24:45 +0300 Subject: [PATCH 03/11] cicd: fix runner in images building job --- .github/workflows/docker-images-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index 0bf3928..2c42bab 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -30,7 +30,7 @@ jobs: - name: linux/arm64 runner: ubuntu-24.04-arm - runs-on: ${{ matrix.image.runner }} + runs-on: ${{ matrix.platform.runner }} steps: - name: Checkout From e402345fc46afaa3395985515165b955271fc8b0 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:28:06 +0300 Subject: [PATCH 04/11] cicd: fix outputs in docker build --- .github/workflows/docker-images-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index 2c42bab..67edb26 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -73,7 +73,7 @@ jobs: cache-from: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }} cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max push: ${{ github.event_name == 'push' }} - outputs: push-by-digest=true,name-canonical=true + outputs: type=image,push-by-digest=true,name-canonical=true,push=${{ github.event_name == 'push' }} platform: ${{ matrix.platform.name }} - name: Export digest From a5c27b08fa0175e7fc82ead6da92d042c2a47508 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:31:54 +0300 Subject: [PATCH 05/11] cicd: fix outputs in docker build --- .github/workflows/docker-images-build-and-push.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index 67edb26..f8fe8d1 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -68,7 +68,6 @@ jobs: with: context: . file: ${{ matrix.image.dockerfile }} - tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }} cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max From a1888c9e447426608fcb1a4ff0d6220e0bfd9140 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:36:47 +0300 Subject: [PATCH 06/11] cicd: fix outputs in docker build with explicit name --- .github/workflows/docker-images-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index f8fe8d1..f016f6a 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -72,7 +72,7 @@ jobs: cache-from: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }} cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max push: ${{ github.event_name == 'push' }} - outputs: type=image,push-by-digest=true,name-canonical=true,push=${{ github.event_name == 'push' }} + outputs: type=image,name=${{ env.IMAGE_NAME }}-${{ matrix.image.name }},push-by-digest=true,name-canonical=true,push=${{ github.event_name == 'push' }} platform: ${{ matrix.platform.name }} - name: Export digest From ef21909b535cb1387bd6a33d0851286706649635 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:39:48 +0300 Subject: [PATCH 07/11] cicd: fix outputs in docker build with explicit name --- .github/workflows/docker-images-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index f016f6a..053b6fd 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -72,7 +72,7 @@ jobs: cache-from: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }} cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max push: ${{ github.event_name == 'push' }} - outputs: type=image,name=${{ env.IMAGE_NAME }}-${{ matrix.image.name }},push-by-digest=true,name-canonical=true,push=${{ github.event_name == 'push' }} + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image.name }},push-by-digest=true,name-canonical=true,push=${{ github.event_name == 'push' }} platform: ${{ matrix.platform.name }} - name: Export digest From de0d5b721c390cc61a0872745f2380ecbfb1e568 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sat, 15 Aug 2026 23:55:04 +0300 Subject: [PATCH 08/11] cicd: hardcode lowercase image name for docker push --- .github/workflows/docker-images-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index 053b6fd..ee8dabb 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -8,7 +8,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} + IMAGE_NAME: parktrack-project/api-server-rs IS_DEFAULT: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} jobs: From 7fff16a973102a09679e40603fb0fbccffc20a11 Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sun, 16 Aug 2026 00:00:38 +0300 Subject: [PATCH 09/11] cicd: fix digest files names --- .github/workflows/docker-images-build-and-push.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index ee8dabb..b4f4768 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -27,8 +27,10 @@ jobs: platform: - name: linux/amd64 runner: ubuntu-24.04 + digest_file_suffix: linux-amd64 - name: linux/arm64 runner: ubuntu-24.04-arm + digest_file_suffix: linux-arm64 runs-on: ${{ matrix.platform.runner }} @@ -84,7 +86,7 @@ jobs: - name: Upload digest artifact uses: actions/upload-artifact@v4 with: - name: digests-${{ matrix.image.name }}-${{ matrix.platform.name }} + name: digests-${{ matrix.image.name }}-${{ matrix.platform.digest_file_suffix }} path: ${{ runner.temp }}/digests/* if-no-files-found: error retention-days: 1 From 439bb5c6bf87a52a9ef6fee4fad78234f9c85eaa Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sun, 16 Aug 2026 00:05:03 +0300 Subject: [PATCH 10/11] cicd: fix permissions for docker manifests merge job --- .github/workflows/docker-images-build-and-push.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index b4f4768..6ca5428 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -94,6 +94,10 @@ jobs: merge-manifests: name: Merge manifests + + permissions: + contents: read + packages: write runs-on: ubuntu-latest From 726fc5b09f032d22be4a204a3507a3c08ba7bf6f Mon Sep 17 00:00:00 2001 From: Lukramancer <57191063+Lukramancer@users.noreply.github.com> Date: Sun, 16 Aug 2026 00:18:06 +0300 Subject: [PATCH 11/11] cicd: fix build-push-action platforms option --- .github/workflows/docker-images-build-and-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-build-and-push.yaml b/.github/workflows/docker-images-build-and-push.yaml index 6ca5428..712b62f 100644 --- a/.github/workflows/docker-images-build-and-push.yaml +++ b/.github/workflows/docker-images-build-and-push.yaml @@ -75,7 +75,7 @@ jobs: cache-to: type=gha,scope=${{ matrix.image.name }}-${{ matrix.platform.name }},mode=max push: ${{ github.event_name == 'push' }} outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ matrix.image.name }},push-by-digest=true,name-canonical=true,push=${{ github.event_name == 'push' }} - platform: ${{ matrix.platform.name }} + platforms: ${{ matrix.platform.name }} - name: Export digest run: |