From 18c299668584d0db4741bc67b87c8ab96a3ccbdd Mon Sep 17 00:00:00 2001 From: Lachee Date: Fri, 19 Sep 2025 17:17:05 +1000 Subject: [PATCH] updated build scripts --- .gitea/workflows/scripts/build-individual-image.sh | 3 ++- .gitea/workflows/scripts/build-runner-image.sh | 5 +++-- README.md | 3 +++ dockerfiles/runner.dockerfile | 2 +- test.sh | 5 +++++ 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 test.sh diff --git a/.gitea/workflows/scripts/build-individual-image.sh b/.gitea/workflows/scripts/build-individual-image.sh index 1d08962..fdb9226 100644 --- a/.gitea/workflows/scripts/build-individual-image.sh +++ b/.gitea/workflows/scripts/build-individual-image.sh @@ -85,7 +85,8 @@ docker build \ --build-arg BASE_IMAGE=${BASE_IMAGE} \ ${ADDITIONAL_TAGS} \ -t ${FULL_IMAGE} \ - ${DOCKER_BUILD_ARGS} dockerfiles/individual.dockerfile + ${DOCKER_BUILD_ARGS} \ + -f ./dockerfiles/individual.dockerfile . if [ $? -ne 0 ]; then echo "Error: Docker build failed." diff --git a/.gitea/workflows/scripts/build-runner-image.sh b/.gitea/workflows/scripts/build-runner-image.sh index a35d580..c3648a8 100644 --- a/.gitea/workflows/scripts/build-runner-image.sh +++ b/.gitea/workflows/scripts/build-runner-image.sh @@ -92,13 +92,14 @@ echo "- Base: ${BASE_IMAGE}" echo "- Tag: ${DEST_TAG}" echo "- Image: ${DEST_IMAGE}" -docker build \ +docker buildx build \ --platform ${PLATFORM} \ --build-arg "VERSION=${UNITY_VERSION}" \ --build-arg "CHANGESET=${UNITY_CHANGESET}" \ --build-arg "BASE_IMAGE=${BASE_IMAGE}" \ --build-arg "MODULE=${UNITY_MODULES}" \ - -t ${DEST_IMAGE} ${DOCKER_BUILD_ARGS} dockerfiles/runner.dockerfile + -t ${DEST_IMAGE} ${DOCKER_BUILD_ARGS} \ + -f ./dockerfiles/runner.dockerfile . if [ $? -ne 0 ]; then echo "Error: Docker build failed." diff --git a/README.md b/README.md index 4223e2b..9c3db94 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ A table of available Docker images for Unity CI/CD: | 6000.0.35f1 |[🐳 View](https://docker.lakes.house/unityci/editor/tag/ubuntu-6000.0.35f1-android-runner) |[🐳 View](https://docker.lakes.house/unityci/editor/tag/ubuntu-6000.0.35f1-ios-runner) |[🐳 View](https://docker.lakes.house/unityci/editor/tag/ubuntu-6000.0.35f1-linux-il2cpp-runner) |[🐳 View](https://docker.lakes.house/unityci/editor/tag/ubuntu-6000.0.35f1-mac-mono-runner) |[🐳 View](https://docker.lakes.house/unityci/editor/tag/ubuntu-6000.0.35f1-webgl-runner) |[🐳 View](https://docker.lakes.house/unityci/editor/tag/ubuntu-6000.0.35f1-windows-mono-runner) | +# Usage + + TODO: https://github.com/mob-sakai/unity-changeset/blob/main/src/unityGraphQL.ts diff --git a/dockerfiles/runner.dockerfile b/dockerfiles/runner.dockerfile index 1c62e0c..3cea866 100644 --- a/dockerfiles/runner.dockerfile +++ b/dockerfiles/runner.dockerfile @@ -82,4 +82,4 @@ COPY scripts/build.sh /build.sh RUN chmod +x /build.sh # Done -# ENTRYPOINT [ "/bin/bash" ] \ No newline at end of file +# ENTRYPOINT [ "/bin/bash" ]~ \ No newline at end of file diff --git a/test.sh b/test.sh new file mode 100644 index 0000000..1589d55 --- /dev/null +++ b/test.sh @@ -0,0 +1,5 @@ +UNITY_VERSION=6000.0.35f1 \ +UNITY_CHANGESET="9a3bc604008a" \ +UNITY_MODULES="webgl linux-server windows-mono mac-mono linux-il2cpp" \ +IMAGE=docker.lakes.house/unityci/editor \ + ./.gitea/workflows/scripts/build-runner-image.sh \ No newline at end of file