Merge remote-tracking branch 'upstream/canary' into feat/add-gitea-repo

apps/dokploy/components/dashboard/settings/cluster/nodes/add-node.tsx

@@ -12,6 +12,7 @@ import { ExternalLink, PlusIcon } from "lucide-react";
 import Link from "next/link";
 import { AddManager } from "./manager/add-manager";
 import { AddWorker } from "./workers/add-worker";
+import { AlertBlock } from "@/components/shared/alert-block";
 
 interface Props {
 	serverId?: string;
@@ -48,6 +49,10 @@ export const AddNode = ({ serverId }: Props) => {
 							Architecture
 							<ExternalLink className="h-4 w-4" />
 						</Link>
+						<AlertBlock type="warning">
+							Make sure you use the same architecture as the node you are
+							adding.
+						</AlertBlock>
 					</DialogDescription>
 				</DialogHeader>
 				<div className="flex flex-col gap-2">

apps/dokploy/components/dashboard/settings/cluster/nodes/show-nodes.tsx

@@ -144,7 +144,7 @@ export const ShowNodes = ({ serverId }: Props) => {
 															<DropdownMenuContent align="end">
 																<DropdownMenuLabel>Actions</DropdownMenuLabel>
 																<ShowNodeData data={node} />
-																{node?.ManagerStatus?.Leader && (
+																{!node?.ManagerStatus?.Leader && (
 																	<DialogAction
 																		title="Delete Node"
 																		description="Are you sure you want to delete this node from the cluster?"

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.20.7",
+	"version": "v0.20.8",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

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

@@ -1,8 +1,9 @@
 import { getPublicIpWithFallback } from "@/server/wss/terminal";
 import {
 	type DockerNode,
-	IS_CLOUD,
 	execAsync,
+	execAsyncRemote,
+	findServerById,
 	getRemoteDocker,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
@@ -16,10 +17,6 @@ export const clusterRouter = createTRPCRouter({
 			}),
 		)
 		.query(async ({ input }) => {
-			if (IS_CLOUD) {
-				return [];
-			}
-
 			const docker = await getRemoteDocker(input.serverId);
 			const workers: DockerNode[] = await docker.listNodes();
 
@@ -33,17 +30,17 @@ export const clusterRouter = createTRPCRouter({
 			}),
 		)
 		.mutation(async ({ input }) => {
-			if (IS_CLOUD) {
-				throw new TRPCError({
-					code: "UNAUTHORIZED",
-					message: "Functionality not available in cloud version",
-				});
-			}
 			try {
-				await execAsync(
+				const drainCommand = `docker node update --availability drain ${input.nodeId}`;
-					`docker node update --availability drain ${input.nodeId}`,
+				const removeCommand = `docker node rm ${input.nodeId} --force`;
-				);
+
-				await execAsync(`docker node rm ${input.nodeId} --force`);
+				if (input.serverId) {
+					await execAsyncRemote(input.serverId, drainCommand);
+					await execAsyncRemote(input.serverId, removeCommand);
+				} else {
+					await execAsync(drainCommand);
+					await execAsync(removeCommand);
+				}
 				return true;
 			} catch (error) {
 				throw new TRPCError({
@@ -60,20 +57,20 @@ export const clusterRouter = createTRPCRouter({
 			}),
 		)
 		.query(async ({ input }) => {
-			if (IS_CLOUD) {
-				return {
-					command: "",
-					version: "",
-				};
-			}
 			const docker = await getRemoteDocker(input.serverId);
 			const result = await docker.swarmInspect();
 			const docker_version = await docker.version();
 
+			let ip = await getPublicIpWithFallback();
+			if (input.serverId) {
+				const server = await findServerById(input.serverId);
+				ip = server?.ipAddress;
+			}
+
 			return {
 				command: `docker swarm join --token ${
 					result.JoinTokens.Worker
-				} ${await getPublicIpWithFallback()}:2377`,
+				} ${ip}:2377`,
 				version: docker_version.Version,
 			};
 		}),
@@ -84,19 +81,19 @@ export const clusterRouter = createTRPCRouter({
 			}),
 		)
 		.query(async ({ input }) => {
-			if (IS_CLOUD) {
-				return {
-					command: "",
-					version: "",
-				};
-			}
 			const docker = await getRemoteDocker(input.serverId);
 			const result = await docker.swarmInspect();
 			const docker_version = await docker.version();
+
+			let ip = await getPublicIpWithFallback();
+			if (input.serverId) {
+				const server = await findServerById(input.serverId);
+				ip = server?.ipAddress;
+			}
 			return {
 				command: `docker swarm join --token ${
 					result.JoinTokens.Manager
-				} ${await getPublicIpWithFallback()}:2377`,
+				} ${ip}:2377`,
 				version: docker_version.Version,
 			};
 		}),