From 3042630107da487f4ac3185f097ad443928fbbb7 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 12:40:32 +0100 Subject: [PATCH 1/7] ci: fix create docker manifest for multi arch build --- .gitea/workflows/cd.yaml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index db7a826..975bbac 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -67,5 +67,24 @@ jobs: platform: linux/${{ matrix.arch }} push: true tags: | - ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} - ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest + ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }} + + create_manifest: + name: Create manifest + needs: + - build_and_push + runs-on: ubuntu-latest + steps: + - name: Login to Registry + uses: docker/login-action@v2 + with: + registry: ${{ env.DOCKER_REGISTRY }} + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} + - name: Create manifest + run: | + docker manifest create ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest \ + ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-amd64 \ + ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-arm64 + + docker manifest push ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest -- 2.49.1 From 682adf10a8e6ffda1af670328bda89301760c2d9 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 12:40:53 +0100 Subject: [PATCH 2/7] tmp --- .gitea/workflows/cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 975bbac..e8a684d 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + pull_request: env: DOCKER_REGISTRY: gitea.t000-n.de -- 2.49.1 From 255422b55b6b6f37094ad94bb68bbf360ab9757f Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 12:48:08 +0100 Subject: [PATCH 3/7] fix add checkout and metadata step --- .gitea/workflows/cd.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index e8a684d..188af33 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -76,12 +76,22 @@ jobs: - build_and_push runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Get Metadata + id: meta + run: | + echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT + echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT + - name: Login to Registry uses: docker/login-action@v2 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} + - name: Create manifest run: | docker manifest create ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest \ -- 2.49.1 From 49f25101e3a83788e2fc3d47cb2bcbfb80b19e5d Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 12:53:43 +0100 Subject: [PATCH 4/7] fix: type platforms --- .gitea/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 188af33..62beac8 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -65,7 +65,7 @@ jobs: with: context: . file: ./Dockerfile - platform: linux/${{ matrix.arch }} + platforms: linux/${{ matrix.arch }} push: true tags: | ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }} -- 2.49.1 From 85fd141dc9607c5afdabf6ab3fbcb9164608a5e7 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 12:56:59 +0100 Subject: [PATCH 5/7] style: fix FromAsCasing --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c3e3d68..a500332 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ COPY --from=install /temp/dev/node_modules node_modules COPY . . RUN bun run build -FROM base as release +FROM base AS release COPY --from=install /temp/prod/node_modules node_modules COPY --from=build /app/dist . -- 2.49.1 From 9117d508a2c72dfb08ab32f90d48ebb95c57c4d4 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 13:45:16 +0100 Subject: [PATCH 6/7] add provenance: false to avoid build-and-push from building maifests --- .gitea/workflows/cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 62beac8..460ccee 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -67,6 +67,7 @@ jobs: file: ./Dockerfile platforms: linux/${{ matrix.arch }} push: true + provenance: false tags: | ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }} -- 2.49.1 From 03d8e576313fb2ac48f9d81d6b337a475d9604f2 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Wed, 8 Jan 2025 13:52:16 +0100 Subject: [PATCH 7/7] Revert "tmp" This reverts commit 682adf10a8e6ffda1af670328bda89301760c2d9. --- .gitea/workflows/cd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 460ccee..93f7429 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - pull_request: env: DOCKER_REGISTRY: gitea.t000-n.de -- 2.49.1