From 7a53e12012a8f0d8542e71510b2e34b912da44e6 Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Tue, 7 Jan 2025 18:33:58 +0100
Subject: [PATCH 1/5] ci: build amd64 and arm64 image on the correct runner

---
 .gitea/workflows/cd.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index 37f68c5..30767db 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -31,9 +31,14 @@ jobs:
 
   build_and_push:
     name: Build and push
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     needs:
       - test
-    runs-on: ubuntu-latest
+    runs-on:
+      - ubuntu-latest
+      - linux_${{ matrix.arch }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -62,9 +67,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: |
-            linux/amd64
-            linux/arm64
+          platform: linux/${{ matrix.arch }}
           push: true
           tags: |
             ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-- 
2.49.1


From 3e02486cbd6ab7260c4783b7a1276bed90724d2f Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Tue, 7 Jan 2025 18:40:55 +0100
Subject: [PATCH 2/5] tmp

---
 .gitea/workflows/cd.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index 30767db..ae8525d 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
@@ -68,7 +69,7 @@ jobs:
           context: .
           file: ./Dockerfile
           platform: linux/${{ matrix.arch }}
-          push: true
+          push: false
           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
-- 
2.49.1


From 55989cc86b5f9c1a51c02400fc2444dad0c96060 Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Tue, 7 Jan 2025 18:42:21 +0100
Subject: [PATCH 3/5] remove qemu

---
 .gitea/workflows/cd.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index ae8525d..303f8b4 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -44,12 +44,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
       - name: Login to Registry
         uses: docker/login-action@v2
         with:
-- 
2.49.1


From 8ea30c4618767878862c38814678780c6b05b6e2 Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Tue, 7 Jan 2025 18:49:03 +0100
Subject: [PATCH 4/5] re-add setup of buildx

---
 .gitea/workflows/cd.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index 303f8b4..3b4da30 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -44,6 +44,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Login to Registry
         uses: docker/login-action@v2
         with:
-- 
2.49.1


From 4fe2524652cb5321c1af946277bd0b8d48db754d Mon Sep 17 00:00:00 2001
From: Timo Behrendt <t.behrendt@t00n.de>
Date: Tue, 7 Jan 2025 19:01:56 +0100
Subject: [PATCH 5/5] Revert "tmp"

This reverts commit 3e02486cbd6ab7260c4783b7a1276bed90724d2f.
---
 .gitea/workflows/cd.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index 3b4da30..db7a826 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
@@ -66,7 +65,7 @@ jobs:
           context: .
           file: ./Dockerfile
           platform: linux/${{ matrix.arch }}
-          push: false
+          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
-- 
2.49.1