Build and push multi-arch docker tags

Author: DJTBOT

.github/workflows/docker-image.yml

@@ -10,13 +10,19 @@ permissions:
   contents: read
   packages: write
 
-env:
-  NIX_CONFIG: |
-    experimental-features = nix-command flakes
-
 jobs:
   build-and-push:
-    runs-on: ubuntu-24.04-arm64
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            system: x86_64-linux
+            suffix: amd64
+          - runner: ubuntu-24.04-arm64
+            system: aarch64-linux
+            suffix: arm64
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -39,12 +45,12 @@ jobs:
           fi
           echo "rev=$rev" >> "$GITHUB_OUTPUT"
 
-      - name: Build image (aarch64-linux)
+      - name: Build image
         shell: bash
         run: |
           set -euo pipefail
           . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-          nix build .#clawdbot-docker
+          nix build .#packages.${{ matrix.system }}.clawdbot-docker
 
       - name: Load image
         shell: bash
@@ -59,8 +65,9 @@ jobs:
         env:
           IMAGE: ghcr.io/clawdbot/clawdbot-gateway
           REV: ${{ steps.version.outputs.rev }}
+          SUFFIX: ${{ matrix.suffix }}
         run: |
-          docker tag clawdbot:latest "$IMAGE:latest"
-          docker tag clawdbot:latest "$IMAGE:$REV"
-          docker push "$IMAGE:latest"
-          docker push "$IMAGE:$REV"
+          docker tag clawdbot:latest "$IMAGE:latest-$SUFFIX"
+          docker tag clawdbot:latest "$IMAGE:$REV-$SUFFIX"
+          docker push "$IMAGE:latest-$SUFFIX"
+          docker push "$IMAGE:$REV-$SUFFIX"