From cff01ed4383d65b3488e9cc22d6d3e551b20d7a0 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 17 May 2025 15:27:42 -0600 Subject: [PATCH] refactor: modify template processing to include APP_NAME variable in configuration --- apps/dokploy/server/api/routers/compose.ts | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index 48c2bfa7..583dde5c 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/apps/dokploy/server/api/routers/compose.ts @@ -439,7 +439,15 @@ export const composeRouter = createTRPCRouter({ } const projectName = slugify(`${project.name} ${input.id}`); - const generate = processTemplate(template.config, { + const appName = `${projectName}-${generatePassword(6)}`; + const config = { + ...template.config, + variables: { + APP_NAME: appName, + ...template.config.variables, + }, + }; + const generate = processTemplate(config, { serverIp: serverIp, projectName: projectName, }); @@ -451,7 +459,7 @@ export const composeRouter = createTRPCRouter({ serverId: input.serverId, name: input.id, sourceType: "raw", - appName: `${projectName}-${generatePassword(6)}`, + appName: appName, isolatedDeployment: true, }); @@ -605,7 +613,15 @@ export const composeRouter = createTRPCRouter({ }); } - const processedTemplate = processTemplate(config, { + const configModified = { + ...config, + variables: { + APP_NAME: compose.appName, + ...config.variables, + }, + }; + + const processedTemplate = processTemplate(configModified, { serverIp: serverIp, projectName: compose.appName, }); @@ -675,7 +691,15 @@ export const composeRouter = createTRPCRouter({ }); } - const processedTemplate = processTemplate(config, { + const configModified = { + ...config, + variables: { + APP_NAME: compose.appName, + ...config.variables, + }, + }; + + const processedTemplate = processTemplate(configModified, { serverIp: serverIp, projectName: compose.appName, });