From c3bf0ae7c73410b26dbbdf6052d1a5cdc2386d6b Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Mon, 27 Oct 2025 11:56:37 +0100
Subject: [PATCH] ci: build multiplatform docker image

---
 .github/workflows/docker.yml | 25 ++++---------------------
 docker-compose.yml           |  1 -
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4a97729c..837b4dd9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,9 +4,9 @@ on:
         branches:
             - main
 jobs:
-    docker-amd64:
+    docker:
         if: github.repository == 'OpenWF/SpaceNinjaServer'
-        runs-on: amd64
+        runs-on: ubuntu-latest
         steps:
             - name: Set up Docker buildx
               uses: docker/setup-buildx-action@v3
@@ -18,27 +18,10 @@ jobs:
             - name: Build and push
               uses: docker/build-push-action@v6
               with:
-                  platforms: linux/amd64
+                  platforms: linux/arm64,linux/amd64
                   push: true
                   tags: |
                       openwf/spaceninjaserver:latest
-                      openwf/spaceninjaserver:${{ github.sha }}
-    docker-arm64:
-        if: github.repository == 'OpenWF/SpaceNinjaServer'
-        runs-on: arm64
-        steps:
-            - name: Set up Docker buildx
-              uses: docker/setup-buildx-action@v3
-            - name: Log in to container registry
-              uses: docker/login-action@v3
-              with:
-                  username: openwf
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-            - name: Build and push
-              uses: docker/build-push-action@v6
-              with:
-                  platforms: linux/arm64
-                  push: true
-                  tags: |
                       openwf/spaceninjaserver:latest-arm64
+                      openwf/spaceninjaserver:${{ github.sha }}
                       openwf/spaceninjaserver:${{ github.sha }}-arm64
diff --git a/docker-compose.yml b/docker-compose.yml
index d9f89348..658f476b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,5 @@
 services:
     spaceninjaserver:
-        # The image to use. If you have an ARM CPU, replace 'latest' with 'latest-arm64'.
         image: openwf/spaceninjaserver:latest
 
         volumes: