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

This commit is contained in:
Nikola Jokic
2022-06-08 15:07:59 +02:00

View File

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