From c50e8fecc2737a821f770422fa7ee5796c306cec Mon Sep 17 00:00:00 2001
From: Lachee <lake.hopkins@outlook.com>
Date: Wed, 7 May 2025 14:15:06 +1000
Subject: [PATCH] updated build script

---
 .gitea/workflows/build-all-images.yaml   |  5 ++---
 .gitea/workflows/build-latest-image.yaml |  5 ++---
 scripts/build-image.sh                   | 25 +++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/build-all-images.yaml b/.gitea/workflows/build-all-images.yaml
index f2c006b..93d376e 100644
--- a/.gitea/workflows/build-all-images.yaml
+++ b/.gitea/workflows/build-all-images.yaml
@@ -19,9 +19,7 @@ jobs:
     needs: get-versions
     runs-on: ubuntu-latest
     env:
-      GAMECI_VERSION: 3
-      PLATFORM: linux/amd64
-      DOCKER_REGISTRY: docker.lakes.house
+      DOCKER_REGISTRY: docker.lakes.house/
 
     strategy:
       matrix:
@@ -43,6 +41,7 @@ jobs:
         env:
           UNITY_VERSION: ${{ matrix.version }}
           UNITY_PLATFORM: ${{ matrix.platform }}
+          IMAGE_NAME: ${{ env.DOCKER_REGISTRY }}unityci/editor
           GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
           
       - name: Push Docker Image
diff --git a/.gitea/workflows/build-latest-image.yaml b/.gitea/workflows/build-latest-image.yaml
index 96898c2..8aff83d 100644
--- a/.gitea/workflows/build-latest-image.yaml
+++ b/.gitea/workflows/build-latest-image.yaml
@@ -15,9 +15,7 @@ jobs:
   build-docker:
     runs-on: ubuntu-latest
     env:
-      GAMECI_VERSION: 3
-      PLATFORM: linux/amd64
-      DOCKER_REGISTRY: docker.lakes.house
+      DOCKER_REGISTRY: docker.lakes.house/
 
     strategy:
       matrix:
@@ -44,6 +42,7 @@ jobs:
         env:
           UNITY_VERSION: ${{ env.UNITY_VERSION }}
           UNITY_PLATFORM: ${{ matrix.platform }}
+          IMAGE_NAME: ${{ env.DOCKER_REGISTRY }}unityci/editor
           GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
 
       - name: Push Docker Image
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index e04d7e8..67bb857 100755
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -19,17 +19,41 @@ if [ -z "${UNITY_PLATFORM}" ]; then
     fi
 fi
 
+# Ensure IMAGE_NAME is set, pull from arguments if not
+if [ -z "${IMAGE_NAME}" ]; then
+    if [ -n "$3" ]; then
+        IMAGE_NAME=$3
+    else
+        echo "Error: IMAGE_NAME is not set."
+        exit 1
+    fi
+fi
+
 # Ensure GAME_CI_VERSION is set, default to 3 if not
 if [ -z "${GAMECI_VERSION}" ]; then
     GAMECI_VERSION=3
 fi
 
+# Ensure PLATFORM is set, default to the current system if not
+if [ -z "${PLATFORM}" ]; then
+    PLATFORM=$(uname -m)
+    case "${PLATFORM}" in
+        x86_64) PLATFORM="linux/amd64" ;;
+        arm64) PLATFORM="linux/arm64" ;;
+        *) 
+            echo "Error: Unsupported platform ${PLATFORM}."
+            exit 1
+            ;;
+    esac
+fi
+
 BASE_IMAGE=unityci/editor:ubuntu-${UNITY_VERSION}-${UNITY_PLATFORM}-${GAMECI_VERSION}
 TAG=ubuntu-${UNITY_VERSION}-${UNITY_PLATFORM}-runner
 
 echo "Base Image: ${BASE_IMAGE}"
 echo "Tag: ${TAG}"
 echo "Image: ${IMAGE_NAME}:${TAG}"
+echo "Platfrom: ${PLATFORM}"
 
 docker build \
     --platform ${PLATFORM} \
@@ -48,4 +72,3 @@ if [ -n "$GITHUB_ENV" ]; then
     echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
     echo "TAG=${TAG}" >> $GITHUB_ENV
 fi
-``
\ No newline at end of file