From 74b2678a497392dc663da6cdbf2c83ec10782b62 Mon Sep 17 00:00:00 2001
From: Shaun Setlock <shaun@setlock.net>
Date: Fri, 9 May 2025 21:00:30 -0400
Subject: [PATCH 1/2] Included arm64 builds to all workflows.

---
 .gitea/workflows/docker_build.yml         |  4 +--
 .gitea/workflows/nightly_docker_build.yml | 30 ++---------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/.gitea/workflows/docker_build.yml b/.gitea/workflows/docker_build.yml
index 9df5e15..05dedd3 100644
--- a/.gitea/workflows/docker_build.yml
+++ b/.gitea/workflows/docker_build.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-push:
+  build-push:
     runs-on: ubuntu-latest
 
     steps:
@@ -38,7 +38,7 @@ jobs:
         with:
           context: ./tools
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: |
             gitea.setlock.net/shaun/dev-container:latest
             gitea.setlock.net/shaun/dev-container:${{ env.GIT_TAG }}
diff --git a/.gitea/workflows/nightly_docker_build.yml b/.gitea/workflows/nightly_docker_build.yml
index 13796a6..a8bb11b 100644
--- a/.gitea/workflows/nightly_docker_build.yml
+++ b/.gitea/workflows/nightly_docker_build.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-amd:
+  build-push:
     runs-on: ubuntu-latest
 
     steps:
@@ -30,32 +30,6 @@ jobs:
         with:
           context: ./tools
           push: true
-          platforms: linux/amd64
-          tags: |
-            gitea.setlock.net/shaun/dev-container:nightly
-
-  build-arm:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.setlock.net
-          username: ${{ secrets.USER }}
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./tools
-          push: true
-          platforms: linux/arm64
+          platforms: linux/amd64,linux/arm64
           tags: |
             gitea.setlock.net/shaun/dev-container:nightly
-- 
2.49.1


From 2fa27cde6352457f11729fac65ec85ee8e6e4a43 Mon Sep 17 00:00:00 2001
From: Shaun Setlock <shaunsetlock@protonmail.com>
Date: Sat, 10 May 2025 14:05:13 -0400
Subject: [PATCH 2/2] Adding QEMU step before buildx setup.

---
 .gitea/workflows/docker_build.yml         | 6 +++---
 .gitea/workflows/nightly_docker_build.yml | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/docker_build.yml b/.gitea/workflows/docker_build.yml
index 05dedd3..7c61d33 100644
--- a/.gitea/workflows/docker_build.yml
+++ b/.gitea/workflows/docker_build.yml
@@ -1,10 +1,7 @@
-# .gitea/workflows/docker-build-push.yml
 name: Build and Push Docker Image
 
 on:
   push:
-    # branches:
-    #   - master
     tags:
       - "v*"
 
@@ -18,6 +15,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
diff --git a/.gitea/workflows/nightly_docker_build.yml b/.gitea/workflows/nightly_docker_build.yml
index a8bb11b..4a87d33 100644
--- a/.gitea/workflows/nightly_docker_build.yml
+++ b/.gitea/workflows/nightly_docker_build.yml
@@ -1,4 +1,3 @@
-# .gitea/workflows/docker-build-push.yml
 name: Build and Push Docker Image
 
 on:
@@ -15,6 +14,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-- 
2.49.1