Merge branch 'Dokploy:canary' into canary

packages/server/src/db/schema/deployment.ts

@@ -31,6 +31,7 @@ export const deployments = pgTable("deployment", {
 	description: text("description"),
 	status: deploymentStatus("status").default("running"),
 	logPath: text("logPath").notNull(),
+	pid: text("pid"),
 	applicationId: text("applicationId").references(
 		() => applications.applicationId,
 		{ onDelete: "cascade" },

packages/server/src/services/deployment.ts

@@ -40,6 +40,7 @@ export const findDeploymentById = async (deploymentId: string) => {
 		where: eq(deployments.deploymentId, deploymentId),
 		with: {
 			application: true,
+			schedule: true,
 		},
 	});
 	if (!deployment) {

packages/server/src/services/preview-deployment.ts

@@ -171,7 +171,7 @@ export const createPreviewDeployment = async (
 	const runningComment = getIssueComment(
 		application.name,
 		"initializing",
-		generateDomain,
+		`${application.previewHttps ? "https" : "http"}://${generateDomain}`,
 	);
 
 	const issue = await octokit.rest.issues.createComment({

packages/server/src/services/schedule.ts

@@ -109,7 +109,12 @@ export const updateSchedule = async (
 const handleScript = async (schedule: Schedule) => {
 	const { SCHEDULES_PATH } = paths(!!schedule?.serverId);
 	const fullPath = path.join(SCHEDULES_PATH, schedule?.appName || "");
-	const encodedContent = encodeBase64(schedule?.script || "");
+
+	// Add PID and Schedule ID echo by default to all scripts
+	const scriptWithPid = `echo "PID: $$ | Schedule ID: ${schedule.scheduleId}"
+${schedule?.script || ""}`;
+
+	const encodedContent = encodeBase64(scriptWithPid);
 	const script = `
 	 	 mkdir -p ${fullPath}
 	 	 rm -f ${fullPath}/script.sh

packages/server/src/utils/backups/compose.ts

@@ -15,7 +15,7 @@ export const runComposeBackup = async (
 ) => {
 	const { projectId, name } = compose;
 	const project = await findProjectById(projectId);
-	const { prefix } = backup;
+	const { prefix, databaseType } = backup;
 	const destination = backup.destination;
 	const backupFileName = `${new Date().toISOString()}.dump.gz`;
 	const bucketDestination = `${normalizeS3Path(prefix)}${backupFileName}`;
@@ -46,9 +46,10 @@ export const runComposeBackup = async (
 		await sendDatabaseBackupNotifications({
 			applicationName: name,
 			projectName: project.name,
-			databaseType: "mongodb",
+			databaseType: getDatabaseType(databaseType),
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
@@ -57,14 +58,31 @@ export const runComposeBackup = async (
 		await sendDatabaseBackupNotifications({
 			applicationName: name,
 			projectName: project.name,
-			databaseType: "mongodb",
+			databaseType: getDatabaseType(databaseType),
 			type: "error",
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;
 	}
 };
+
+const getDatabaseType = (databaseType: BackupSchedule["databaseType"]) => {
+	if (databaseType === "mongo") {
+		return "mongodb";
+	}
+	if (databaseType === "postgres") {
+		return "postgres";
+	}
+	if (databaseType === "mariadb") {
+		return "mariadb";
+	}
+	if (databaseType === "mysql") {
+		return "mysql";
+	}
+	return "mongodb";
+};

packages/server/src/utils/backups/mariadb.ts

@@ -48,6 +48,7 @@ export const runMariadbBackup = async (
 			databaseType: "mariadb",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
@@ -60,6 +61,7 @@ export const runMariadbBackup = async (
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;

packages/server/src/utils/backups/mongo.ts

@@ -46,6 +46,7 @@ export const runMongoBackup = async (mongo: Mongo, backup: BackupSchedule) => {
 			databaseType: "mongodb",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
@@ -58,6 +59,7 @@ export const runMongoBackup = async (mongo: Mongo, backup: BackupSchedule) => {
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;

packages/server/src/utils/backups/mysql.ts

@@ -47,6 +47,7 @@ export const runMySqlBackup = async (mysql: MySql, backup: BackupSchedule) => {
 			databaseType: "mysql",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 	} catch (error) {
@@ -59,6 +60,7 @@ export const runMySqlBackup = async (mysql: MySql, backup: BackupSchedule) => {
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 		await updateDeploymentStatus(deployment.deploymentId, "error");
 		throw error;

packages/server/src/utils/backups/postgres.ts

@@ -50,6 +50,7 @@ export const runPostgresBackup = async (
 			databaseType: "postgres",
 			type: "success",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
@@ -62,6 +63,7 @@ export const runPostgresBackup = async (
 			// @ts-ignore
 			errorMessage: error?.message || "Error message not provided",
 			organizationId: project.organizationId,
+			databaseName: backup.database,
 		});
 
 		await updateDeploymentStatus(deployment.deploymentId, "error");

packages/server/src/utils/builders/compose.ts

@@ -193,7 +193,7 @@ const createEnvFile = (compose: ComposeNested) => {
 	let envContent = `APP_NAME=${appName}\n`;
 	envContent += env || "";
 	if (!envContent.includes("DOCKER_CONFIG")) {
-		envContent += "\nDOCKER_CONFIG=/root/.docker/config.json";
+		envContent += "\nDOCKER_CONFIG=/root/.docker";
 	}
 
 	if (compose.randomize) {
@@ -223,7 +223,7 @@ export const getCreateEnvFileCommand = (compose: ComposeNested) => {
 	let envContent = `APP_NAME=${appName}\n`;
 	envContent += env || "";
 	if (!envContent.includes("DOCKER_CONFIG")) {
-		envContent += "\nDOCKER_CONFIG=/root/.docker/config.json";
+		envContent += "\nDOCKER_CONFIG=/root/.docker";
 	}
 
 	if (compose.randomize) {

packages/server/src/utils/builders/index.ts

@@ -1,5 +1,4 @@
 import { createWriteStream } from "node:fs";
-import { join } from "node:path";
 import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
 import { uploadImage, uploadImageRemoteCommand } from "../cluster/upload";
@@ -211,16 +210,20 @@ export const mechanizeDockerContainer = async (
 
 const getImageName = (application: ApplicationNested) => {
 	const { appName, sourceType, dockerImage, registry } = application;
-
+	const imageName = `${appName}:latest`;
 	if (sourceType === "docker") {
 		return dockerImage || "ERROR-NO-IMAGE-PROVIDED";
 	}
 
 	if (registry) {
-		return join(registry.registryUrl, registry.imagePrefix || "", appName);
+		const { registryUrl, imagePrefix, username } = registry;
+		const registryTag = imagePrefix
+			? `${registryUrl}/${imagePrefix}/${imageName}`
+			: `${registryUrl}/${username}/${imageName}`;
+		return registryTag;
 	}
 
-	return `${appName}:latest`;
+	return imageName;
 };
 
 const getAuthConfig = (application: ApplicationNested) => {

packages/server/src/utils/cluster/upload.ts

@@ -1,5 +1,4 @@
 import type { WriteStream } from "node:fs";
-import path, { join } from "node:path";
 import type { ApplicationNested } from "../builders";
 import { spawnAsync } from "../process/spawnAsync";
 
@@ -13,19 +12,22 @@ export const uploadImage = async (
 		throw new Error("Registry not found");
 	}
 
-	const { registryUrl, imagePrefix } = registry;
+	const { registryUrl, imagePrefix, username } = registry;
 	const { appName } = application;
 	const imageName = `${appName}:latest`;
 
 	const finalURL = registryUrl;
 
-	const registryTag = path
-		.join(registryUrl, join(imagePrefix || "", imageName))
-		.replace(/\/+/g, "/");
+	// Build registry tag in correct format: registry.com/owner/image:tag
+	// For ghcr.io: ghcr.io/username/image:tag
+	// For docker.io: docker.io/username/image:tag
+	const registryTag = imagePrefix
+		? `${registryUrl}/${imagePrefix}/${imageName}`
+		: `${registryUrl}/${username}/${imageName}`;
 
 	try {
 		writeStream.write(
-			`📦 [Enabled Registry] Uploading image to ${registry.registryType} | ${imageName} | ${finalURL}\n`,
+			`📦 [Enabled Registry] Uploading image to ${registry.registryType} | ${imageName} | ${finalURL} | ${registryTag}\n`,
 		);
 		const loginCommand = spawnAsync(
 			"docker",
@@ -67,15 +69,16 @@ export const uploadImageRemoteCommand = (
 		throw new Error("Registry not found");
 	}
 
-	const { registryUrl, imagePrefix } = registry;
+	const { registryUrl, imagePrefix, username } = registry;
 	const { appName } = application;
 	const imageName = `${appName}:latest`;
 
 	const finalURL = registryUrl;
 
-	const registryTag = path
-		.join(registryUrl, join(imagePrefix || "", imageName))
-		.replace(/\/+/g, "/");
+	// Build registry tag in correct format: registry.com/owner/image:tag
+	const registryTag = imagePrefix
+		? `${registryUrl}/${imagePrefix}/${imageName}`
+		: `${registryUrl}/${username}/${imageName}`;
 
 	try {
 		const command = `

packages/server/src/utils/notifications/database-backup.ts

@@ -19,6 +19,7 @@ export const sendDatabaseBackupNotifications = async ({
 	type,
 	errorMessage,
 	organizationId,
+	databaseName,
 }: {
 	projectName: string;
 	applicationName: string;
@@ -26,6 +27,7 @@ export const sendDatabaseBackupNotifications = async ({
 	type: "error" | "success";
 	organizationId: string;
 	errorMessage?: string;
+	databaseName: string;
 }) => {
 	const date = new Date();
 	const unixDate = ~~(Number(date) / 1000);
@@ -90,6 +92,11 @@ export const sendDatabaseBackupNotifications = async ({
 						value: databaseType,
 						inline: true,
 					},
+					{
+						name: decorate("`📂`", "Database Name"),
+						value: databaseName,
+						inline: true,
+					},
 					{
 						name: decorate("`📅`", "Date"),
 						value: `<t:${unixDate}:D>`,
@@ -136,6 +143,7 @@ export const sendDatabaseBackupNotifications = async ({
 				`${decorate("🛠️", `Project: ${projectName}`)}` +
 					`${decorate("⚙️", `Application: ${applicationName}`)}` +
 					`${decorate("❔", `Type: ${databaseType}`)}` +
+					`${decorate("📂", `Database Name: ${databaseName}`)}` +
 					`${decorate("🕒", `Date: ${date.toLocaleString()}`)}` +
 					`${type === "error" && errorMessage ? decorate("❌", `Error:\n${errorMessage}`) : ""}`,
 			);
@@ -150,7 +158,7 @@ export const sendDatabaseBackupNotifications = async ({
 				? `\n\n<b>Error:</b>\n<pre>${errorMessage}</pre>`
 				: "";
 
-			const messageText = `<b>${statusEmoji} Database Backup ${typeStatus}</b>\n\n<b>Project:</b> ${projectName}\n<b>Application:</b> ${applicationName}\n<b>Type:</b> ${databaseType}\n<b>Date:</b> ${format(date, "PP")}\n<b>Time:</b> ${format(date, "pp")}${isError ? errorMsg : ""}`;
+			const messageText = `<b>${statusEmoji} Database Backup ${typeStatus}</b>\n\n<b>Project:</b> ${projectName}\n<b>Application:</b> ${applicationName}\n<b>Type:</b> ${databaseType}\n<b>Database Name:</b> ${databaseName}\n<b>Date:</b> ${format(date, "PP")}\n<b>Time:</b> ${format(date, "pp")}${isError ? errorMsg : ""}`;
 
 			await sendTelegramNotification(telegram, messageText);
 		}
@@ -191,6 +199,10 @@ export const sendDatabaseBackupNotifications = async ({
 								value: databaseType,
 								short: true,
 							},
+							{
+								title: "Database Name",
+								value: databaseName,
+							},
 							{
 								title: "Time",
 								value: date.toLocaleString(),

packages/server/src/utils/schedules/utils.ts

@@ -2,7 +2,10 @@ import { createWriteStream } from "node:fs";
 import path from "node:path";
 import { paths } from "@dokploy/server/constants";
 import type { Schedule } from "@dokploy/server/db/schema/schedule";
-import { createDeploymentSchedule } from "@dokploy/server/services/deployment";
+import {
+	createDeploymentSchedule,
+	updateDeployment,
+} from "@dokploy/server/services/deployment";
 import { updateDeploymentStatus } from "@dokploy/server/services/deployment";
 import { findScheduleById } from "@dokploy/server/services/schedule";
 import { scheduleJob as scheduleJobNode, scheduledJobs } from "node-schedule";
@@ -113,8 +116,16 @@ export const runCommand = async (scheduleId: string) => {
 			await spawnAsync(
 				"bash",
 				["-c", "./script.sh"],
-				(data) => {
+				async (data) => {
 					if (writeStream.writable) {
+						// we need to extract the PID and Schedule ID from the data
+						const pid = data?.match(/PID: (\d+)/)?.[1];
+
+						if (pid) {
+							await updateDeployment(deployment.deploymentId, {
+								pid,
+							});
+						}
 						writeStream.write(data);
 					}
 				},
@@ -133,13 +144,21 @@ export const runCommand = async (scheduleId: string) => {
 			const command = `
 				set -e
 				echo "Running script" >> ${deployment.logPath};
-				bash -c ${fullPath}/script.sh >> ${deployment.logPath} 2>> ${deployment.logPath} || { 
+				bash -c ${fullPath}/script.sh 2>&1 | tee -a ${deployment.logPath} || { 
 					echo "❌ Command failed" >> ${deployment.logPath};
 					exit 1;
 				  }
 				echo "✅ Command executed successfully" >> ${deployment.logPath};
 			`;
-			await execAsyncRemote(serverId, command);
+			await execAsyncRemote(serverId, command, async (data) => {
+				// we need to extract the PID and Schedule ID from the data
+				const pid = data?.match(/PID: (\d+)/)?.[1];
+				if (pid) {
+					await updateDeployment(deployment.deploymentId, {
+						pid,
+					});
+				}
+			});
 		} catch (error) {
 			await updateDeploymentStatus(deployment.deploymentId, "error");
 			throw error;