Merge branch 'canary' into feat/templates-2

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

@@ -359,14 +359,6 @@ export const composeRouter = createTRPCRouter({
 			const admin = await findAdminById(ctx.user.adminId);
 			let serverIp = admin.serverIp || "127.0.0.1";
 
-			if (!serverIp) {
-				throw new TRPCError({
-					code: "NOT_FOUND",
-					message:
-						"You need to have a server IP to deploy this template in order to generate domains",
-				});
-			}
-
 			const project = await findProjectById(input.projectId);
 
 			if (input.serverId) {

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

@@ -80,6 +80,7 @@ export const stripeRouter = createTRPCRouter({
 				metadata: {
 					adminId: admin.adminId,
 				},
+				allow_promotion_codes: true,
 				success_url: `${WEBSITE_URL}/dashboard/settings/billing`,
 				cancel_url: `${WEBSITE_URL}/dashboard/settings/billing`,
 			});

apps/dokploy/server/utils/backup.ts

@@ -20,10 +20,8 @@ export const schedule = async (job: QueueJob) => {
 			body: JSON.stringify(job),
 		});
 		const data = await result.json();
-		console.log(data);
 		return data;
 	} catch (error) {
-		console.log(error);
 		throw error;
 	}
 };
@@ -39,10 +37,8 @@ export const removeJob = async (job: QueueJob) => {
 			body: JSON.stringify(job),
 		});
 		const data = await result.json();
-		console.log(data);
 		return data;
 	} catch (error) {
-		console.log(error);
 		throw error;
 	}
 };
@@ -58,10 +54,8 @@ export const updateJob = async (job: QueueJob) => {
 			body: JSON.stringify(job),
 		});
 		const data = await result.json();
-		console.log(data);
 		return data;
 	} catch (error) {
-		console.log(error);
 		throw error;
 	}
 };

apps/dokploy/server/utils/deploy.ts

@@ -7,6 +7,7 @@ export const deploy = async (jobData: DeploymentJob) => {
 		if (server.serverStatus === "inactive") {
 			throw new Error("Server is inactive");
 		}
+
 		const result = await fetch(`${process.env.SERVER_URL}/deploy`, {
 			method: "POST",
 			headers: {
@@ -15,11 +16,10 @@ export const deploy = async (jobData: DeploymentJob) => {
 			},
 			body: JSON.stringify(jobData),
 		});
+
 		const data = await result.json();
-		console.log(data);
 		return data;
 	} catch (error) {
-		console.log(error);
 		throw error;
 	}
 };

apps/dokploy/server/wss/docker-container-terminal.ts

@@ -62,9 +62,6 @@ export const setupDockerContainerTerminalWebSocketServer = (
 
 								stream
 									.on("close", (code: number, signal: string) => {
-										console.log(
-											`Stream :: close :: code: ${code}, signal: ${signal}`,
-										);
 										ws.send(`\nContainer closed with code: ${code}\n`);
 										conn.end();
 									})