Cloud Runner v2 (#310)

src/model/docker.ts

@@ -1,5 +1,6 @@
 import { exec } from '@actions/exec';
 import ImageTag from './image-tag';
+import ImageEnvironmentFactory from './image-environment-factory';
 
 class Docker {
   static async build(buildParameters, silent = false) {
@@ -18,31 +19,7 @@ class Docker {
   }
 
   static async run(image, parameters, silent = false) {
-    const {
-      version,
-      workspace,
-      unitySerial,
-      runnerTempPath,
-      platform,
-      projectPath,
-      buildName,
-      buildPath,
-      buildFile,
-      buildMethod,
-      buildVersion,
-      androidVersionCode,
-      androidKeystoreName,
-      androidKeystoreBase64,
-      androidKeystorePass,
-      androidKeyaliasName,
-      androidKeyaliasPass,
-      androidTargetSdkVersion,
-      androidSdkManagerParameters,
-      customParameters,
-      sshAgent,
-      gitPrivateToken,
-      chownFilesTo,
-    } = parameters;
+    const { workspace, unitySerial, runnerTempPath, sshAgent } = parameters;
 
     const baseOsSpecificArguments = this.getBaseOsSpecificArguments(
       process.platform,
@@ -55,45 +32,7 @@ class Docker {
     const runCommand = `docker run \
     --workdir /github/workspace \
     --rm \
-    --env UNITY_LICENSE \
-    --env UNITY_LICENSE_FILE \
-    --env UNITY_EMAIL \
-    --env UNITY_PASSWORD \
-    --env UNITY_VERSION="${version}" \
-    --env USYM_UPLOAD_AUTH_TOKEN \
-    --env PROJECT_PATH="${projectPath}" \
-    --env BUILD_TARGET="${platform}" \
-    --env BUILD_NAME="${buildName}" \
-    --env BUILD_PATH="${buildPath}" \
-    --env BUILD_FILE="${buildFile}" \
-    --env BUILD_METHOD="${buildMethod}" \
-    --env VERSION="${buildVersion}" \
-    --env ANDROID_VERSION_CODE="${androidVersionCode}" \
-    --env ANDROID_KEYSTORE_NAME="${androidKeystoreName}" \
-    --env ANDROID_KEYSTORE_BASE64="${androidKeystoreBase64}" \
-    --env ANDROID_KEYSTORE_PASS="${androidKeystorePass}" \
-    --env ANDROID_KEYALIAS_NAME="${androidKeyaliasName}" \
-    --env ANDROID_KEYALIAS_PASS="${androidKeyaliasPass}" \
-    --env ANDROID_TARGET_SDK_VERSION="${androidTargetSdkVersion}" \
-    --env ANDROID_SDK_MANAGER_PARAMETERS="${androidSdkManagerParameters}" \
-    --env CUSTOM_PARAMETERS="${customParameters}" \
-    --env CHOWN_FILES_TO="${chownFilesTo}" \
-    --env GITHUB_REF \
-    --env GITHUB_SHA \
-    --env GITHUB_REPOSITORY \
-    --env GITHUB_ACTOR \
-    --env GITHUB_WORKFLOW \
-    --env GITHUB_HEAD_REF \
-    --env GITHUB_BASE_REF \
-    --env GITHUB_EVENT_NAME \
-    --env GITHUB_WORKSPACE=/github/workspace \
-    --env GITHUB_ACTION \
-    --env GITHUB_EVENT_PATH \
-    --env RUNNER_OS \
-    --env RUNNER_TOOL_CACHE \
-    --env RUNNER_TEMP \
-    --env RUNNER_WORKSPACE \
-    --env GIT_PRIVATE_TOKEN="${gitPrivateToken}" \
+    ${ImageEnvironmentFactory.getEnvVarString(parameters)} \
     ${baseOsSpecificArguments} \
     ${image}`;