cleanup
parent
e77aee6a4b
commit
8c19def256
|
|
@ -5713,7 +5713,7 @@ class Docker {
|
|||
return `docker run \
|
||||
--workdir /github/workspace \
|
||||
--rm \
|
||||
${entrypointBash ? `--entrypoint /bin/bash` : ``}
|
||||
${entrypointBash ? `--entrypoint /bin/bash` : ``} \
|
||||
${image_environment_factory_1.default.getEnvVarString(parameters, additionalVariables)} \
|
||||
--env UNITY_SERIAL \
|
||||
--env GITHUB_WORKSPACE=/github/workspace \
|
||||
|
|
@ -5728,7 +5728,7 @@ class Docker {
|
|||
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
|
||||
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
|
||||
${image} \
|
||||
${entrypointBash ? `--entrypoint` : ``} ${image === `alpine` || image === `amazon/aws-cli:latest` ? `/bin/sh -c ` : `/bin/bash -c `} \
|
||||
${image === `alpine` || image === `amazon/aws-cli:latest` ? `/bin/sh -c ` : `/bin/bash -c `} \
|
||||
${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}`;
|
||||
}
|
||||
static getWindowsCommand(image, parameters) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -46,7 +46,7 @@ class Docker {
|
|||
return `docker run \
|
||||
--workdir /github/workspace \
|
||||
--rm \
|
||||
${entrypointBash ? `--entrypoint /bin/bash` : ``}
|
||||
${entrypointBash ? `--entrypoint /bin/bash` : ``} \
|
||||
${ImageEnvironmentFactory.getEnvVarString(parameters, additionalVariables)} \
|
||||
--env UNITY_SERIAL \
|
||||
--env GITHUB_WORKSPACE=/github/workspace \
|
||||
|
|
@ -61,9 +61,7 @@ class Docker {
|
|||
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
|
||||
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
|
||||
${image} \
|
||||
${entrypointBash ? `--entrypoint` : ``} ${
|
||||
image === `alpine` || image === `amazon/aws-cli:latest` ? `/bin/sh -c ` : `/bin/bash -c `
|
||||
} \
|
||||
${image === `alpine` || image === `amazon/aws-cli:latest` ? `/bin/sh -c ` : `/bin/bash -c `} \
|
||||
${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}`;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue