From 454ff6054c1f699d4eb38285c796384033425666 Mon Sep 17 00:00:00 2001 From: Webber Date: Sat, 21 Dec 2019 13:56:00 +0100 Subject: [PATCH] Set build args for container --- Dockerfile | 10 +++++++--- dist/index.js | Bin 19259 -> 19359 bytes dist/run-unity-builder.sh | 24 ++++++++++++++---------- src/index.js | 17 +++++++++++++++-- src/run-unity-builder.sh | 24 ++++++++++++++---------- 5 files changed, 50 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8fea678..fa5af25b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,8 @@ -FROM gableroux/unity3d:2019.2.11f1-webgl +ARG IMAGE_REPOSITORY +ARG IMAGE_NAME +ARG IMAGE_VERSION + +FROM $IMAGE_REPOSITORY/$IMAGE_NAME:$IMAGE_VERSION LABEL "com.github.actions.name"="Unity - Builder" LABEL "com.github.actions.description"="Build Unity projects for different platforms." @@ -9,9 +13,9 @@ LABEL "repository"="http://github.com/webbertakken/unity-actions" LABEL "homepage"="http://github.com/webbertakken/unity-actions" LABEL "maintainer"="Webber Takken " -ENV BUILD_TARGET=WebGL - ADD default-build-script /UnityBuilderAction ADD entrypoint.sh /entrypoint.sh + RUN chmod +x /entrypoint.sh + ENTRYPOINT ["/entrypoint.sh"] diff --git a/dist/index.js b/dist/index.js index f7a2843ee4439e9f89ea7fe5bacbf4074ef9d5dd..c17a16a17a7e8d32464b6794c52fc296aadcfe43 100644 GIT binary patch delta 164 zcmdlzjdA{T#toa@_(~Fs(o;(UauQ3@@{4jO?{m}CE6vL+sSHakD$dN$Q_`tUNli;E z%_*@`GBPl<)HBjEG)yy8s@1ek&d)0@QOKWs%guDMle_R_C3gkJ(#g*5ddexbc~IFL z+Y-H!e4qUC)FS7^;#3WouC&QT?%IrLljpfh0Lks{n!G7GIXbC2B|7;!$vUN*U%Ce| F0{|{XIgkJV delta 78 zcmbO~opJXx#toa@xRXjVb5cSQi_%j|CLeUuoUH1uF { diff --git a/src/run-unity-builder.sh b/src/run-unity-builder.sh index deba43bf..47481482 100644 --- a/src/run-unity-builder.sh +++ b/src/run-unity-builder.sh @@ -4,12 +4,13 @@ # Input variables # -PROJECT_PATH=$1 -UNITY_VERSION="2019.2.11f1" -BUILD_TARGET=$2 -BUILD_NAME=$3 -BUILDS_PATH=$4 -BUILD_METHOD=$5 +IMAGE_UNITY_VERSION=$1 +IMAGE_TARGET_PLATFORM=$2 +PROJECT_PATH=$3 +TARGET_PLATFORM=$4 +BUILD_NAME=$5 +BUILDS_PATH=$6 +BUILD_METHOD=$7 # # Default variables @@ -42,9 +43,9 @@ BUILD_METHOD=$5 # ACTION_ROOT=$(dirname $(dirname $(readlink -fm "$0"))) -DOCKER_IMAGE_TAG=webber-unity:$UNITY_VERSION-$BUILD_TARGET +DOCKER_IMAGE_TAG=unity-builder:$UNITY_VERSION-$TARGET_PLATFORM -# TODO - Remove debug statements below +# TODO - Remove debug statements (after it is proven to work) echo "Listing ACTION_ROOT" ls $ACTION_ROOT @@ -60,9 +61,12 @@ echo "" # Build image # -echo "Building docker images for $BUILD_TARGET" +echo "Building docker image for $UNITY_VERSION-$TARGET_PLATFORM" docker build $GITHUB_WORKSPACE \ --file $ACTION_ROOT/Dockerfile \ + --build-arg IMAGE_REPOSITORY=gableroux \ + --build-arg IMAGE_NAME=unity3d \ + --build-arg IMAGE_VERSION=$IMAGE_UNITY_VERSION-$IMAGE_TARGET_PLATFORM \ --tag $DOCKER_IMAGE_TAG # @@ -73,7 +77,7 @@ docker run \ --workdir /github/workspace \ --rm \ --env PROJECT_PATH \ - --env BUILD_TARGET \ + --env BUILD_TARGET=$TARGET_PLATFORM \ --env BUILD_NAME \ --env BUILDS_PATH \ --env BUILD_METHOD \