Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 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
commit 335b36d3a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats 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];
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'];
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}`);
}
value['build'] = {
...build,
args: [...(build?.args || []), ...buildEnvs]
args: [...buildArgs, ...buildEnvs]
};
value['labels'] = labels;