From 383a28795e27ce8a5262e4532ef7a08fe35375de Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Sun, 24 May 2026 19:12:04 +0100
Subject: [PATCH] ci: Build azahar-room Docker image for ARM64

---
 .ci/docker.sh               |  2 +-
 .github/workflows/build.yml | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.ci/docker.sh b/.ci/docker.sh
index b7f31f937..492506efd 100755
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -14,7 +14,7 @@ echo "Tag name is: $TAG_NAME"
 
 docker build --no-cache -f docker/azahar-room/Dockerfile -t azahar-room:$TAG_NAME .
 mkdir -p build
-FILENAME="azahar-room-$TAG_NAME.dockerimage"
+FILENAME="azahar-room-$TARGET-$TAG_NAME.dockerimage"
 docker save azahar-room:$TAG_NAME > build/$FILENAME
 
 echo "DOCKER_IMAGE_PATH=artifacts/$FILENAME" >> $GITHUB_ENV
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64c7af9d5..defc17dbb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -396,15 +396,24 @@ jobs:
           sbom-path: src/android/app/artifacts/android-${{ matrix.target }}.spdx.json
 
   docker:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - target: x86_64
+          os: ubuntu-24.04
+        - target: arm64
+          os: ubuntu-24.04-arm
+    runs-on: ${{ matrix.os }}
     container:
-      image: docker:dind
+      # Can't use docker:dind for ARM64 because it's Alpine-based, see https://github.com/actions/upload-artifact/issues/739
+      image: earthbuild/dind:ubuntu-24.04-docker-28.5.2-1
+    env:
+      TARGET: ${{ matrix.target }}
     steps:
       - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Install tools
-        run: apk add bash
       - name: Fix git ownership
         run: git config --global --add safe.directory .
       - name: Build Docker image
@@ -424,7 +433,7 @@ jobs:
       - name: Upload
         uses: actions/upload-artifact@v7
         with:
-          name: docker
+          name: docker-${{ env.TARGET }}
           path: artifacts/
       - name: Attest artifacts
         if: ${{ github.ref_type == 'tag' }}