From 5ec6ef642f817411196634f050b3a355bc84e794 Mon Sep 17 00:00:00 2001 From: Manuel Sabogal Date: Thu, 30 Jan 2025 02:03:44 +0100 Subject: [PATCH 1/5] Added manual workflow support for arm64 --- .github/workflows/docker-image-manual.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-manual.yml b/.github/workflows/docker-image-manual.yml index f0e9148908a..dfa52eb2fdb 100644 --- a/.github/workflows/docker-image-manual.yml +++ b/.github/workflows/docker-image-manual.yml @@ -4,7 +4,20 @@ on: workflow_dispatch jobs: publish: name: Build and publish Docker image - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + include: + - platform: linux/amd64 + os: ubuntu-latest + tag-prefix: -amd64 + - platform: linux/arm64 + os: ubuntu-24.04-arm + tag-prefix: -arm64 + runs-on: ${{ matrix.os }} steps: - name: Check out repository code uses: actions/checkout@v4 @@ -19,7 +32,7 @@ jobs: with: images: | ${{ secrets.DOCKER_NAMESPACE }}/rallly - tags: ${{ steps.extractGitBranch.outputs.branchName }} + tags: ${{ steps.extractGitBranch.outputs.branchName }}${{ matrix.tag-prefix }} - name: Log in to Docker Hub uses: docker/login-action@v3 @@ -31,7 +44,7 @@ jobs: uses: docker/build-push-action@v5 with: file: ./apps/web/Dockerfile - platforms: linux/amd64 + platforms: ${{ matrix.platform }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 7ac03bcf6d9ab41e6d79554a5923c97489889523 Mon Sep 17 00:00:00 2001 From: Manuel Sabogal Date: Thu, 30 Jan 2025 02:11:28 +0100 Subject: [PATCH 2/5] Added release workflow support for arm64 --- .../docker-image-version-release.yml | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-image-version-release.yml b/.github/workflows/docker-image-version-release.yml index 64a96835bc4..802c5a39f0c 100644 --- a/.github/workflows/docker-image-version-release.yml +++ b/.github/workflows/docker-image-version-release.yml @@ -7,7 +7,20 @@ on: jobs: publish: name: Build and publish Docker image - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + include: + - platform: linux/amd64 + os: ubuntu-latest + tag-prefix: -amd64 + - platform: linux/arm64 + os: ubuntu-24.04-arm + tag-prefix: -arm64 + runs-on: ${{ matrix.os }} steps: - name: Check out repository code uses: actions/checkout@v4 @@ -19,9 +32,9 @@ jobs: images: | ${{ secrets.DOCKER_NAMESPACE }}/rallly tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=semver,pattern={{version}}${{ matrix.tag-prefix }} + type=semver,pattern={{major}}.{{minor}}${{ matrix.tag-prefix }} + type=semver,pattern={{major}}${{ matrix.tag-prefix }} - name: Log in to Docker Hub uses: docker/login-action@v3 @@ -33,7 +46,7 @@ jobs: uses: docker/build-push-action@v5 with: file: ./apps/web/Dockerfile - platforms: linux/amd64 + platforms: ${{ matrix.platform }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 524945778ea951eaa29ab993ece4358e236757d2 Mon Sep 17 00:00:00 2001 From: Manuel Sabogal Date: Thu, 30 Jan 2025 02:45:04 +0100 Subject: [PATCH 3/5] Add support for multiplatform images --- .github/workflows/docker-image-manual.yml | 84 +++++++++++++++-- .../docker-image-version-release.yml | 89 ++++++++++++++++--- 2 files changed, 152 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docker-image-manual.yml b/.github/workflows/docker-image-manual.yml index dfa52eb2fdb..496513290e7 100644 --- a/.github/workflows/docker-image-manual.yml +++ b/.github/workflows/docker-image-manual.yml @@ -1,9 +1,12 @@ name: Build and publish Docker image on: workflow_dispatch +env: + DOCKERHUB_REPO: ${{ secrets.DOCKER_NAMESPACE }}/rallly + jobs: - publish: - name: Build and publish Docker image + build: + name: Build the Docker image strategy: fail-fast: false matrix: @@ -13,12 +16,15 @@ jobs: include: - platform: linux/amd64 os: ubuntu-latest - tag-prefix: -amd64 - platform: linux/arm64 os: ubuntu-24.04-arm - tag-prefix: -arm64 runs-on: ${{ matrix.os }} steps: + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - name: Check out repository code uses: actions/checkout@v4 @@ -31,8 +37,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ${{ secrets.DOCKER_NAMESPACE }}/rallly - tags: ${{ steps.extractGitBranch.outputs.branchName }}${{ matrix.tag-prefix }} + ${{ env.DOCKERHUB_REPO }} + tags: ${{ steps.extractGitBranch.outputs.branchName }} - name: Log in to Docker Hub uses: docker/login-action@v3 @@ -40,14 +46,74 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and publish image + - 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 by digest + id: build uses: docker/build-push-action@v5 with: file: ./apps/web/Dockerfile platforms: ${{ matrix.platform }} - push: true - tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,"name=${{ env.DOCKERHUB_REPO }}",push-by-digest=true,name-canonical=true,push=true build-args: | APP_VERSION=${{ github.ref_name }} SELF_HOSTED=true + + - name: Export digest + run: | + mkdir -p ${{ runner.temp }}/digests + digest="${{ steps.build.outputs.digest }}" + touch "${{ runner.temp }}/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: ${{ runner.temp }}/digests/* + if-no-files-found: error + retention-days: 1 + + merge-and-publish: + name: Merge digests and publish the Docker image + runs-on: ubuntu-latest + needs: + - build + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: ${{ runner.temp }}/digests + pattern: digests-* + merge-multiple: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.DOCKERHUB_REPO }} + tags: ${{ steps.extractGitBranch.outputs.branchName }} + + - name: Create manifest list and push + working-directory: ${{ runner.temp }}/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }} diff --git a/.github/workflows/docker-image-version-release.yml b/.github/workflows/docker-image-version-release.yml index 802c5a39f0c..d6bc5218115 100644 --- a/.github/workflows/docker-image-version-release.yml +++ b/.github/workflows/docker-image-version-release.yml @@ -4,9 +4,12 @@ on: tags: - "v*" +env: + DOCKERHUB_REPO: ${{ secrets.DOCKER_NAMESPACE }}/rallly + jobs: - publish: - name: Build and publish Docker image + build: + name: Build the Docker image strategy: fail-fast: false matrix: @@ -16,12 +19,15 @@ jobs: include: - platform: linux/amd64 os: ubuntu-latest - tag-prefix: -amd64 - platform: linux/arm64 os: ubuntu-24.04-arm - tag-prefix: -arm64 runs-on: ${{ matrix.os }} steps: + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - name: Check out repository code uses: actions/checkout@v4 @@ -30,11 +36,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ${{ secrets.DOCKER_NAMESPACE }}/rallly - tags: | - type=semver,pattern={{version}}${{ matrix.tag-prefix }} - type=semver,pattern={{major}}.{{minor}}${{ matrix.tag-prefix }} - type=semver,pattern={{major}}${{ matrix.tag-prefix }} + ${{ env.DOCKERHUB_REPO }} - name: Log in to Docker Hub uses: docker/login-action@v3 @@ -42,14 +44,77 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and publish image + - 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 by digest + id: build uses: docker/build-push-action@v5 with: file: ./apps/web/Dockerfile platforms: ${{ matrix.platform }} - push: true - tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,"name=${{ env.DOCKERHUB_REPO }}",push-by-digest=true,name-canonical=true,push=true build-args: | APP_VERSION=${{ github.ref_name }} SELF_HOSTED=true + + - name: Export digest + run: | + mkdir -p ${{ runner.temp }}/digests + digest="${{ steps.build.outputs.digest }}" + touch "${{ runner.temp }}/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: ${{ runner.temp }}/digests/* + if-no-files-found: error + retention-days: 1 + + merge-and-publish: + name: Merge digests and publish the Docker image + runs-on: ubuntu-latest + needs: + - build + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: ${{ runner.temp }}/digests + pattern: digests-* + merge-multiple: true + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.DOCKERHUB_REPO }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + + - name: Create manifest list and push + working-directory: ${{ runner.temp }}/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }} From 106b9dc4bed48f6f0c3fbf4d65f61618505e32cc Mon Sep 17 00:00:00 2001 From: Manuel Sabogal Date: Fri, 31 Jan 2025 22:21:04 +0100 Subject: [PATCH 4/5] Remove QEMU job --- .github/workflows/docker-image-manual.yml | 5 +---- .github/workflows/docker-image-version-release.yml | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/docker-image-manual.yml b/.github/workflows/docker-image-manual.yml index 496513290e7..02d6340b3c9 100644 --- a/.github/workflows/docker-image-manual.yml +++ b/.github/workflows/docker-image-manual.yml @@ -46,9 +46,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -63,7 +60,7 @@ jobs: build-args: | APP_VERSION=${{ github.ref_name }} SELF_HOSTED=true - + - name: Export digest run: | mkdir -p ${{ runner.temp }}/digests diff --git a/.github/workflows/docker-image-version-release.yml b/.github/workflows/docker-image-version-release.yml index d6bc5218115..3b4702b18e5 100644 --- a/.github/workflows/docker-image-version-release.yml +++ b/.github/workflows/docker-image-version-release.yml @@ -44,9 +44,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From f426aa7a5312db955ab31e26f94681d08500333f Mon Sep 17 00:00:00 2001 From: Manuel Sabogal Date: Wed, 5 Feb 2025 00:44:22 +0100 Subject: [PATCH 5/5] Added missing step to get the branch make --- .github/workflows/docker-image-manual.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-image-manual.yml b/.github/workflows/docker-image-manual.yml index 02d6340b3c9..9d93f78dca2 100644 --- a/.github/workflows/docker-image-manual.yml +++ b/.github/workflows/docker-image-manual.yml @@ -97,6 +97,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Get branch name + id: extractGitBranch + run: echo "branchName=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT + - name: Docker meta id: meta uses: docker/metadata-action@v5