Revert "Specified base image in building"

This reverts commit 4a719b91eb40d2a51d6c768bfb401d28f05ec8ba.
This commit is contained in:
Lachee 2025-05-18 14:54:14 +10:00
parent 4a719b91eb
commit 6d910d6f2f
3 changed files with 1 additions and 17 deletions

View File

@ -71,7 +71,6 @@ jobs:
IMAGE: ${{ env.DOCKER_REGISTRY }}unityci/editor IMAGE: ${{ env.DOCKER_REGISTRY }}unityci/editor
GAMECI_VERSION: ${{ env.GAMECI_VERSION }} GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
ONLY_RUNNER_TAG: true ONLY_RUNNER_TAG: true
UBUNTU_IMAGE: gitea/runner-images:ubuntu-latest
- name: Docker Push - name: Docker Push
run: | run: |

View File

@ -73,26 +73,15 @@ if [ "${ONLY_RUNNER_TAG}" != "true" ]; then
ADDITIONAL_TAGS="$ADDITIONAL_TAGS -t ${IMAGE}:${SHORT_TAG}-${GAMECI_VERSION}" ADDITIONAL_TAGS="$ADDITIONAL_TAGS -t ${IMAGE}:${SHORT_TAG}-${GAMECI_VERSION}"
fi 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 "Building Docker image ${FULL_IMAGE}"
echo "- Platfrom: ${PLATFORM}" echo "- Platfrom: ${PLATFORM}"
echo "- Base Image: ${BASE_IMAGE}" echo "- Base: ${BASE_IMAGE}"
echo "- Tag: ${TAG}" echo "- Tag: ${TAG}"
echo "- Image: ${IMAGE}:${TAG}" echo "- Image: ${IMAGE}:${TAG}"
echo "- Additional Tags: ${ADDITIONAL_TAGS}" echo "- Additional Tags: ${ADDITIONAL_TAGS}"
echo "- Additional Args: ${ADDITIONAL_ARGS}"
docker build \ docker build \
--platform ${PLATFORM} \ --platform ${PLATFORM} \
${ADDITIONAL_ARGS} \
--build-arg BASE_IMAGE=${BASE_IMAGE} \ --build-arg BASE_IMAGE=${BASE_IMAGE} \
${ADDITIONAL_TAGS} \ ${ADDITIONAL_TAGS} \
-t ${FULL_IMAGE} \ -t ${FULL_IMAGE} \

View File

@ -22,9 +22,6 @@ jobs:
- mac-mono - mac-mono
- windows-mono - windows-mono
- linux-il2cpp - linux-il2cpp
ubuntu_image:
- ubuntu-latest
# - ubuntu-latest-full
name: Build 🐳 ${{ matrix.platform }} name: Build 🐳 ${{ matrix.platform }}
environment: environment:
@ -53,7 +50,6 @@ jobs:
UNITY_PLATFORM: ${{ matrix.platform }} UNITY_PLATFORM: ${{ matrix.platform }}
IMAGE: "${{ vars.DOCKERHUB_USERNAME }}/unity-runner" IMAGE: "${{ vars.DOCKERHUB_USERNAME }}/unity-runner"
GAMECI_VERSION: ${{ env.GAMECI_VERSION }} GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
UBUNTU_IMAGE: gitea/runner-images:${{ matrix.ubuntu_image }}
- name: Docker Push - name: Docker Push
run: | run: |