From db5cd218840137b204dd30328ae9e64d9411b8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Talha=20Zekeriya=20Durmu=C5=9F?= Date: Tue, 17 Jan 2023 02:04:01 +0100 Subject: [PATCH 1/2] Fix docker-compose build args --- apps/api/src/lib/buildPacks/compose.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts index 6a13c124c..5c341b3f6 100644 --- a/apps/api/src/lib/buildPacks/compose.ts +++ b/apps/api/src/lib/buildPacks/compose.ts @@ -52,13 +52,14 @@ export default async function (data) { } value['environment'] = [...environment, ...envs]; - let build = typeof value['build'] === 'undefined' ? [] : value['build']; - if (Object.keys(build).length > 0) { - build = Object.entries(build).map(([key, value]) => `${key}=${value}`); + let build = typeof value['build'] === 'undefined' ? {} : value['build']; + let buildArgs = typeof build['args'] === 'undefined' ? [] : value['args']; + if (Object.keys(buildArgs).length > 0) { + buildArgs = Object.entries(buildArgs).map(([key, value]) => `${key}=${value}`); } value['build'] = { ...build, - args: [...(build?.args || []), ...buildEnvs] + args: [...buildArgs, ...buildEnvs] }; value['labels'] = labels; From 2be30fae00409d7c9d0e703e32c43dadf492d87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Talha=20Zekeriya=20Durmu=C5=9F?= Date: Tue, 17 Jan 2023 02:11:06 +0100 Subject: [PATCH 2/2] Handle string build parameter --- apps/api/src/lib/buildPacks/compose.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/api/src/lib/buildPacks/compose.ts b/apps/api/src/lib/buildPacks/compose.ts index 5c341b3f6..b22c129ea 100644 --- a/apps/api/src/lib/buildPacks/compose.ts +++ b/apps/api/src/lib/buildPacks/compose.ts @@ -53,6 +53,9 @@ export default async function (data) { value['environment'] = [...environment, ...envs]; let build = typeof value['build'] === 'undefined' ? {} : value['build']; + if (typeof build === 'string') { + build = { context: build } + } let buildArgs = typeof build['args'] === 'undefined' ? [] : value['args']; if (Object.keys(buildArgs).length > 0) { buildArgs = Object.entries(buildArgs).map(([key, value]) => `${key}=${value}`);