From 08e4b8fe33ebbb0d0db7ae7a1c2c4e70b70a5a0b Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 11 Mar 2025 00:27:59 -0600 Subject: [PATCH 1/2] refactor: update project name reference in compose template processing Change references from `compose.project.name` to `compose.appName` when processing compose templates to ensure correct project naming --- apps/dokploy/server/api/routers/compose.ts | 4 ++-- packages/server/src/templates/index.ts | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index 57f04559e..acb8e1729 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/apps/dokploy/server/api/routers/compose.ts @@ -607,7 +607,7 @@ export const composeRouter = createTRPCRouter({ const processedTemplate = processTemplate(config, { serverIp: serverIp, - projectName: compose.project.name, + projectName: compose.appName, }); return { @@ -676,7 +676,7 @@ export const composeRouter = createTRPCRouter({ const processedTemplate = processTemplate(config, { serverIp: serverIp, - projectName: compose.project.name, + projectName: compose.appName, }); // Update compose file diff --git a/packages/server/src/templates/index.ts b/packages/server/src/templates/index.ts index 14ff0ac08..6ae264185 100644 --- a/packages/server/src/templates/index.ts +++ b/packages/server/src/templates/index.ts @@ -53,14 +53,12 @@ export const generatePassword = (quantity = 16): string => { }; /** - * Generate a random base64 string of specified length + * Generate a random base64 string from N random bytes + * @param bytes Number of random bytes to generate before base64 encoding (default: 32) + * @returns base64 encoded string of the random bytes */ -export function generateBase64(length: number): string { - // To get N characters in base64, we need to generate N * 3/4 bytes - const bytesNeeded = Math.ceil((length * 3) / 4); - return Buffer.from(randomBytes(bytesNeeded)) - .toString("base64") - .substring(0, length); +export function generateBase64(bytes = 32): string { + return randomBytes(bytes).toString("base64"); } export function generateJwt(length = 256): string { From 666a8ede972d73e48b96a22e7393461ae014ec60 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 11 Mar 2025 00:29:07 -0600 Subject: [PATCH 2/2] chore(version): bump project version to v0.20.2 Update package.json version to reflect minor release --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 4a4c946eb..22fe71be6 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.20.0", + "version": "v0.20.2", "private": true, "license": "Apache-2.0", "type": "module",