dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #857 from zek/patch-2

Browse Source 
Fix docker-compose build args
This commit is contained in:
Andras Bacsai
2023-01-17 09:26:12 +01:00
committed by GitHub
parent 344c36997a 2be30fae00
commit 335b36d3a9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/api/src/lib/buildPacks/compose.ts
View File

@@ -52,13 +52,17 @@ export default async function (data) {
} }
value['environment'] = [...environment, ...envs]; value['environment'] = [...environment, ...envs];
let build = typeof value['build'] === 'undefined' ? [] : value['build']; let build = typeof value['build'] === 'undefined' ? {} : value['build'];
if (Object.keys(build).length > 0) { if (typeof build === 'string') {
build = Object.entries(build).map(([key, value]) => `${key}=${value}`); 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}`);
} }
value['build'] = { value['build'] = {
...build, ...build,
args: [...(build?.args || []), ...buildEnvs] args: [...buildArgs, ...buildEnvs]
}; };
value['labels'] = labels; value['labels'] = labels;