Merge branch 'canary' into 319-ability-to-roll-back-service-depoyments

apps/dokploy/server/api/routers/application.ts

@@ -330,6 +330,7 @@ export const applicationRouter = createTRPCRouter({
 				dockerContextPath: input.dockerContextPath,
 				dockerBuildStage: input.dockerBuildStage,
 				herokuVersion: input.herokuVersion,
+				isStaticSpa: input.isStaticSpa,
 			});
 
 			return true;

apps/dokploy/server/api/routers/compose.ts

@@ -51,9 +51,9 @@ import { processTemplate } from "@dokploy/server/templates/processors";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { dump } from "js-yaml";
-import { parse } from "toml";
 import _ from "lodash";
 import { nanoid } from "nanoid";
+import { parse } from "toml";
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
 
@@ -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,
 				});

apps/dokploy/server/api/routers/deployment.ts

@@ -1,3 +1,4 @@
+import { db } from "@/server/db";
 import {
 	apiFindAllByApplication,
 	apiFindAllByCompose,
@@ -16,7 +17,6 @@ import {
 import { TRPCError } from "@trpc/server";
 import { desc, eq } from "drizzle-orm";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
-import { db } from "@/server/db";
 
 export const deploymentRouter = createTRPCRouter({
 	all: protectedProcedure

apps/dokploy/server/api/routers/project.ts

@@ -21,32 +21,32 @@ import {
 	addNewProject,
 	checkProjectAccess,
 	createApplication,
+	createBackup,
 	createCompose,
+	createDomain,
 	createMariadb,
 	createMongo,
+	createMount,
 	createMysql,
+	createPort,
 	createPostgres,
+	createPreviewDeployment,
 	createProject,
+	createRedirect,
 	createRedis,
+	createSecurity,
 	deleteProject,
 	findApplicationById,
 	findComposeById,
-	findMongoById,
+	findMariadbById,
 	findMemberById,
-	findRedisById,
+	findMongoById,
+	findMySqlById,
+	findPostgresById,
 	findProjectById,
+	findRedisById,
 	findUserById,
 	updateProjectById,
-	findPostgresById,
-	findMariadbById,
-	findMySqlById,
-	createDomain,
-	createPort,
-	createMount,
-	createRedirect,
-	createPreviewDeployment,
-	createBackup,
-	createSecurity,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { and, desc, eq, sql } from "drizzle-orm";
@@ -309,6 +309,7 @@ export const projectRouter = createTRPCRouter({
 						}),
 					)
 					.optional(),
+				duplicateInSameProject: z.boolean().default(false),
 			}),
 		)
 		.mutation(async ({ ctx, input }) => {
@@ -331,15 +332,17 @@ export const projectRouter = createTRPCRouter({
 					});
 				}
 
-				// Create new project
-				const newProject = await createProject(
-					{
-						name: input.name,
-						description: input.description,
-						env: sourceProject.env,
-					},
-					ctx.session.activeOrganizationId,
-				);
+				// Create new project or use existing one
+				const targetProject = input.duplicateInSameProject
+					? sourceProject
+					: await createProject(
+							{
+								name: input.name,
+								description: input.description,
+								env: sourceProject.env,
+							},
+							ctx.session.activeOrganizationId,
+						);
 
 				if (input.includeServices) {
 					const servicesToDuplicate = input.selectedServices || [];
@@ -362,7 +365,10 @@ export const projectRouter = createTRPCRouter({
 
 								const newApplication = await createApplication({
 									...application,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${application.name} (copy)`
+										: application.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const domain of domains) {
@@ -423,7 +429,10 @@ export const projectRouter = createTRPCRouter({
 
 								const newPostgres = await createPostgres({
 									...postgres,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${postgres.name} (copy)`
+										: postgres.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const mount of mounts) {
@@ -449,7 +458,10 @@ export const projectRouter = createTRPCRouter({
 									await findMariadbById(id);
 								const newMariadb = await createMariadb({
 									...mariadb,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${mariadb.name} (copy)`
+										: mariadb.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const mount of mounts) {
@@ -475,7 +487,10 @@ export const projectRouter = createTRPCRouter({
 									await findMongoById(id);
 								const newMongo = await createMongo({
 									...mongo,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${mongo.name} (copy)`
+										: mongo.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const mount of mounts) {
@@ -501,7 +516,10 @@ export const projectRouter = createTRPCRouter({
 									await findMySqlById(id);
 								const newMysql = await createMysql({
 									...mysql,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${mysql.name} (copy)`
+										: mysql.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const mount of mounts) {
@@ -526,7 +544,10 @@ export const projectRouter = createTRPCRouter({
 								const { redisId, mounts, ...redis } = await findRedisById(id);
 								const newRedis = await createRedis({
 									...redis,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${redis.name} (copy)`
+										: redis.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const mount of mounts) {
@@ -545,7 +566,10 @@ export const projectRouter = createTRPCRouter({
 									await findComposeById(id);
 								const newCompose = await createCompose({
 									...compose,
-									projectId: newProject.projectId,
+									name: input.duplicateInSameProject
+										? `${compose.name} (copy)`
+										: compose.name,
+									projectId: targetProject.projectId,
 								});
 
 								for (const mount of mounts) {
@@ -572,21 +596,20 @@ export const projectRouter = createTRPCRouter({
 					};
 
 					// Duplicate selected services
-
 					for (const service of servicesToDuplicate) {
 						await duplicateService(service.id, service.type);
 					}
 				}
 
-				if (ctx.user.role === "member") {
+				if (!input.duplicateInSameProject && ctx.user.role === "member") {
 					await addNewProject(
 						ctx.user.id,
-						newProject.projectId,
+						targetProject.projectId,
 						ctx.session.activeOrganizationId,
 					);
 				}
 
-				return newProject;
+				return targetProject;
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",

apps/dokploy/server/api/routers/schedule.ts

@@ -1,24 +1,24 @@
-import { TRPCError } from "@trpc/server";
-import { z } from "zod";
+import { removeJob, schedule } from "@/server/utils/backup";
+import { IS_CLOUD, scheduleJob } from "@dokploy/server";
+import { removeScheduleJob } from "@dokploy/server";
+import { db } from "@dokploy/server/db";
+import { deployments } from "@dokploy/server/db/schema/deployment";
 import {
 	createScheduleSchema,
 	schedules,
 	updateScheduleSchema,
 } from "@dokploy/server/db/schema/schedule";
-import { desc, eq } from "drizzle-orm";
-import { db } from "@dokploy/server/db";
-import { createTRPCRouter, protectedProcedure } from "../trpc";
 import { runCommand } from "@dokploy/server/index";
-import { deployments } from "@dokploy/server/db/schema/deployment";
 import {
+	createSchedule,
 	deleteSchedule,
 	findScheduleById,
-	createSchedule,
 	updateSchedule,
 } from "@dokploy/server/services/schedule";
-import { IS_CLOUD, scheduleJob } from "@dokploy/server";
-import { removeJob, schedule } from "@/server/utils/backup";
-import { removeScheduleJob } from "@dokploy/server";
+import { TRPCError } from "@trpc/server";
+import { desc, eq } from "drizzle-orm";
+import { z } from "zod";
+import { createTRPCRouter, protectedProcedure } from "../trpc";
 export const scheduleRouter = createTRPCRouter({
 	create: protectedProcedure
 		.input(createScheduleSchema)

apps/dokploy/server/wss/drawer-logs.ts

@@ -1,9 +1,9 @@
 import type http from "node:http";
+import { validateRequest } from "@dokploy/server/lib/auth";
 import { applyWSSHandler } from "@trpc/server/adapters/ws";
 import { WebSocketServer } from "ws";
 import { appRouter } from "../api/root";
 import { createTRPCContext } from "../api/trpc";
-import { validateRequest } from "@dokploy/server/lib/auth";
 
 export const setupDrawerLogsWebSocketServer = (
 	server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>,