dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 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

14
apps/api/src/jobs/deployApplication.ts
View File

@@ -141,9 +141,12 @@ import * as buildpacks from '../lib/buildPacks';
} catch (error) {
//
}
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)
];
}
await fs.writeFile(`${workdir}/Dockerfile`, simpleDockerfile);
if (dockerRegistry) {
@@ -676,9 +679,12 @@ import * as buildpacks from '../lib/buildPacks';
} catch (error) {
//
}
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)
];
}
if (dockerRegistry) {
const { url, username, password } = dockerRegistry;