actions/runner-container-hooks
1
0
Fork 0
mirror of https://github.com/actions/runner-container-hooks.git synced 2025-12-14 16:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nikola-jokic/docker-env' into nikola-jokic/computed-build-directory

Browse Source
This commit is contained in:
Nikola Jokic
2022-06-08 15:07:59 +02:00
parent 9ce39e5a60 150bc0503a
commit 51bd8b62a4
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/docker/src/dockerCommands/container.ts
View File

@@ -44,13 +44,9 @@ export async function createContainer(
} }
if (args.environmentVariables) { if (args.environmentVariables) {
for (const [key, value] of Object.entries(args.environmentVariables)) { for (const [key] of Object.entries(args.environmentVariables)) {
dockerArgs.push('-e') dockerArgs.push('-e')
if (!value) { dockerArgs.push(`"${key}"`)
dockerArgs.push(`"${key}"`)
} else {
dockerArgs.push(`"${key}=${value}"`)
}
} }
} }
@@ -344,13 +340,9 @@ export async function containerExecStep(
): Promise<void> { ): Promise<void> {
const dockerArgs: string[] = ['exec', '-i'] const dockerArgs: string[] = ['exec', '-i']
dockerArgs.push(`--workdir=${args.workingDirectory}`) dockerArgs.push(`--workdir=${args.workingDirectory}`)
for (const [key, value] of Object.entries(args['environmentVariables'])) { for (const [key] of Object.entries(args['environmentVariables'])) {
dockerArgs.push('-e') dockerArgs.push('-e')
if (!value) { dockerArgs.push(`"${key}"`)
dockerArgs.push(`"${key}"`)
} else {
dockerArgs.push(`"${key}=${value}"`)
}
} }
// Todo figure out prepend path and update it here // Todo figure out prepend path and update it here