ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-17 04:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: env variables in compose deplyoments

Browse Source
This commit is contained in:
Andras Bacsai
2023-07-27 12:40:58 +02:00
parent 807a3c9d66
commit 1c8c567791
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,29 +52,36 @@ export default async function (data) {
}
let environment = typeof value['environment'] === 'undefined' ? [] : value['environment'];
let finalEnvs = [...envs];
if (Object.keys(environment).length > 0) {
environment = Object.entries(environment).map(([key, value]) => `${key}=${value}`);
for (const arg of Object.keys(environment)) {
const [key, _] = arg.split('=');
if (finalEnvs.filter((env) => env.startsWith(key)).length === 0) {
finalEnvs.push(arg);
}
}
// environment = Object.entries(environment).map(([key, value]) => `${key}=${value}`);
}
value['environment'] = [...environment, ...envs];
value['environment'] = [...finalEnvs];
let build = typeof value['build'] === 'undefined' ? [] : value['build'];
if (typeof build === 'string') {
build = { context: build };
}
const buildArgs = typeof build['args'] === 'undefined' ? [] : build['args'];
let finalArgs = [...buildEnvs];
let finalBuildArgs = [...buildEnvs];
if (Object.keys(buildArgs).length > 0) {
for (const arg of Object.keys(buildArgs)) {
const [key, _] = arg.split('=');
if (finalArgs.filter((env) => env.startsWith(key)).length === 0) {
finalArgs.push(arg);
if (finalBuildArgs.filter((env) => env.startsWith(key)).length === 0) {
finalBuildArgs.push(arg);
}
}
}
if (build.length > 0 || buildArgs.length > 0) {
value['build'] = {
...build,
args: finalArgs
args: finalBuildArgs
};
}
@@ -121,7 +128,6 @@ export default async function (data) {
.replace(/^\./, `~`)
.replace(/^\.\./, '~')
.replace(/^\$PWD/, '~');
console.log({ source });
} else {
if (!target) {
target = source;