From 4a719b91eb40d2a51d6c768bfb401d28f05ec8ba Mon Sep 17 00:00:00 2001
From: Lachee <lake.hopkins@outlook.com>
Date: Sun, 18 May 2025 14:43:17 +1000
Subject: [PATCH] Specified base image in building

---
 .gitea/workflows/create-image.yaml      |  1 +
 .gitea/workflows/scripts/build-image.sh | 13 ++++++++++++-
 .github/workflows/create-image.yaml     |  4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/create-image.yaml b/.gitea/workflows/create-image.yaml
index 7b6b6ec..36a0577 100644
--- a/.gitea/workflows/create-image.yaml
+++ b/.gitea/workflows/create-image.yaml
@@ -71,6 +71,7 @@ jobs:
           IMAGE: ${{ env.DOCKER_REGISTRY }}unityci/editor
           GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
           ONLY_RUNNER_TAG: true
+          UBUNTU_IMAGE: gitea/runner-images:ubuntu-latest
 
       - name: Docker Push
         run: |
diff --git a/.gitea/workflows/scripts/build-image.sh b/.gitea/workflows/scripts/build-image.sh
index bc51702..a9ce728 100755
--- a/.gitea/workflows/scripts/build-image.sh
+++ b/.gitea/workflows/scripts/build-image.sh
@@ -73,15 +73,26 @@ if [ "${ONLY_RUNNER_TAG}" != "true" ]; then
     ADDITIONAL_TAGS="$ADDITIONAL_TAGS -t ${IMAGE}:${SHORT_TAG}-${GAMECI_VERSION}"
 fi
 
+ADDITIONAL_ARGS=""
+if [ ! -z "${WINDOWS_IMAGE}" ]; then
+    ADDITIONAL_ARGS="${ADDITIONAL_ARGS} --build-arg windowsImage=${WINDOWS_IMAGE}"
+fi
+if [ ! -z "${UBUNTU_IMAGE}" ]; then
+    ADDITIONAL_ARGS="${ADDITIONAL_ARGS} --build-arg ubuntuImage=${UBUNTU_IMAGE}"
+fi
+
+
 echo "Building Docker image ${FULL_IMAGE}"
 echo "- Platfrom: ${PLATFORM}"
-echo "- Base: ${BASE_IMAGE}"
+echo "- Base Image: ${BASE_IMAGE}"
 echo "- Tag: ${TAG}"
 echo "- Image: ${IMAGE}:${TAG}"
 echo "- Additional Tags: ${ADDITIONAL_TAGS}"
+echo "- Additional Args: ${ADDITIONAL_ARGS}"
 
 docker build \
     --platform ${PLATFORM} \
+    ${ADDITIONAL_ARGS} \
     --build-arg BASE_IMAGE=${BASE_IMAGE} \
     ${ADDITIONAL_TAGS} \
     -t ${FULL_IMAGE} \
diff --git a/.github/workflows/create-image.yaml b/.github/workflows/create-image.yaml
index 1aaca6d..702c4f8 100644
--- a/.github/workflows/create-image.yaml
+++ b/.github/workflows/create-image.yaml
@@ -22,6 +22,9 @@ jobs:
           - mac-mono
           - windows-mono
           - linux-il2cpp
+        ubuntu_image: 
+          - ubuntu-latest
+          # - ubuntu-latest-full
         
     name: Build 🐳 ${{ matrix.platform }}
     environment:
@@ -50,6 +53,7 @@ jobs:
           UNITY_PLATFORM: ${{ matrix.platform }}
           IMAGE: "${{ vars.DOCKERHUB_USERNAME }}/unity-runner"
           GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
+          UBUNTU_IMAGE: gitea/runner-images:${{ matrix.ubuntu_image }}
 
       - name: Docker Push
         run: |