diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index c29248976..fd9824eb0 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -198,32 +198,32 @@ export const processComposeFile = (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); const { env, appName, sourceType, composeType } = compose; + const inputPath = + sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + const composeInputFilePath = + join(COMPOSE_PATH, appName, "code", inputPath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + + const outputPath = "docker-compose.processed.yml"; + const composeOutputFilePath = + join(COMPOSE_PATH, appName, "code", outputPath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.processed.yml"); + + let templateContent = readFileSync(composeInputFilePath, "utf8"); + if (composeType === "stack") { - const inputPath = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - const composeInputFilePath = - join(COMPOSE_PATH, appName, "code", inputPath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - - const outputPath = "docker-compose.processed.yml"; - const composeOutputFilePath = - join(COMPOSE_PATH, appName, "code", outputPath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.processed.yml"); - const envContent = prepareEnvironmentVariables(env || "").join("\n"); const envVariables = dotenv.parse(envContent); - let templateContent = readFileSync(composeInputFilePath, "utf8"); - templateContent = templateContent.replace( /\$\{([^}]+)\}/g, (_, varName) => { return envVariables[varName] || ""; }, ); - - writeFileSync(composeOutputFilePath, templateContent); } + + writeFileSync(composeOutputFilePath, templateContent); }; export const getProcessComposeFileCommand = (compose: ComposeNested) => {