Merge branch 'canary' into unify-deployment-logic

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

@@ -4,6 +4,7 @@ import {
 	findNotificationById,
 	findOrganizationById,
 	findUserById,
+	getDokployUrl,
 	getUserByToken,
 	IS_CLOUD,
 	removeUserById,
@@ -419,11 +420,10 @@ export const userRouter = createTRPCRouter({
 				});
 			}
 
-			const admin = await findAdmin();
 			const host =
 				process.env.NODE_ENV === "development"
 					? "http://localhost:3000"
-					: admin.user.host;
+					: await getDokployUrl();
 			const inviteLink = `${host}/invitation?token=${input.invitationId}`;
 
 			const organization = await findOrganizationById(

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

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

packages/server/src/services/admin.ts

@@ -110,7 +110,8 @@ export const getDokployUrl = async () => {
 	const admin = await findAdmin();
 
 	if (admin.user.host) {
-		return `https://${admin.user.host}`;
+		const protocol = admin.user.https ? "https" : "http";
+		return `${protocol}://${admin.user.host}`;
 	}
 	return `http://${admin.user.serverIp}:${process.env.PORT}`;
 };

packages/server/src/services/deployment.ts

@@ -112,7 +112,6 @@ export const createDeployment = async (
 				logPath: logFilePath,
 				description: deployment.description || "",
 				startedAt: new Date().toISOString(),
-				// applicationBuildServerId: application.serverBuildId,
 			})
 			.returning();
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {