ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-29 05:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate env variables

Browse Source
This commit is contained in:
Andras Bacsai
2022-12-21 13:24:30 +01:00
parent 9c6f412f04
commit 1ee9d041df
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/api/src/routes/api/v1/applications/handlers.ts
View File

@@ -569,10 +569,12 @@ export async function restartApplication(
} = application;
let location = null;
let envs = ['NODE_ENV=production', `PORT=${port}`];
let envs = [];
if (secrets.length > 0) {
envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, port)];
}
console.log(envs);
const { workdir } = await createDirectories({ repository, buildId });
const labels = [];
let image = null;
@@ -659,6 +661,7 @@ export async function restartApplication(
},
volumes: Object.assign({}, ...composeVolumes)
};
console.log(yaml.dump(composeFile));
await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
try {
await executeCommand({ dockerId, command: `docker stop -t 0 ${id}` });
@@ -1370,9 +1373,9 @@ export async function restartPreview(
exposePort
} = application;
let envs = ['NODE_ENV=production', `PORT=${port}`];
let envs = [];
if (secrets.length > 0) {
envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId)];
envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, port)];
}
const { workdir } = await createDirectories({ repository, buildId });
const labels = [];