Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-07-08 07:25:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'canary' into feat/stack-env-support

Browse Source
This commit is contained in:
Mauricio Siu
2024-12-08 18:35:40 -06:00
parent 65ee0a3e22 bf9abbc37c
commit 79b733536f
322 changed files with 39371 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/server/src/utils/builders/compose.ts
View File

@@ -183,7 +183,10 @@ const createEnvFile = (compose: ComposeNested) => {
envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`;
}
const envFileContent = prepareEnvironmentVariables(envContent).join("\n");
const envFileContent = prepareEnvironmentVariables(
envContent,
compose.project.env,
).join("\n");
if (!existsSync(dirname(envFilePath))) {
mkdirSync(dirname(envFilePath), { recursive: true });
@@ -241,7 +244,10 @@ export const getCreateEnvFileCommand = (compose: ComposeNested) => {
envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`;
}
const envFileContent = prepareEnvironmentVariables(envContent).join("\n");
const envFileContent = prepareEnvironmentVariables(
envContent,
compose.project.env,
).join("\n");
const encodedContent = encodeBase64(envFileContent);
return `