From 9d6f2df25a1f73e6eb49d576a65197610924ae8b Mon Sep 17 00:00:00 2001
From: Erick Luis <erickluis00@hotmail.com>
Date: Sun, 18 Aug 2024 22:18:45 +0000
Subject: [PATCH 1/2] fix: wrong Docker version in Add Node commands

---
 .../cluster/nodes/manager/add-manager.tsx     |  8 ++++----
 .../cluster/nodes/workers/add-worker.tsx      |  8 ++++----
 apps/dokploy/server/api/routers/cluster.ts    | 20 +++++++++++++------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx
index f0b9a773..b4c25c88 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx
@@ -23,12 +23,12 @@ export const AddManager = () => {
 					<div className="flex flex-col gap-2.5 text-sm">
 						<span>1. Go to your new server and run the following command</span>
 						<span className="bg-muted rounded-lg p-2 flex justify-between">
-							curl https://get.docker.com | sh -s -- --version 24.0
+							curl https://get.docker.com | sh -s -- --version {data?.version}
 							<button
 								type="button"
 								className="self-center"
 								onClick={() => {
-									copy("curl https://get.docker.com | sh -s -- --version 24.0");
+									copy(`curl https://get.docker.com | sh -s -- --version ${data?.version}`);
 									toast.success("Copied to clipboard");
 								}}
 							>
@@ -43,12 +43,12 @@ export const AddManager = () => {
 							cluster
 						</span>
 						<span className="bg-muted rounded-lg p-2  flex">
-							{data}
+							{data?.command}
 							<button
 								type="button"
 								className="self-start"
 								onClick={() => {
-									copy(data || "");
+									copy(data?.command || "");
 									toast.success("Copied to clipboard");
 								}}
 							>
diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx
index 9cca90e4..029b2c5f 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx
@@ -22,12 +22,12 @@ export const AddWorker = () => {
 				<div className="flex flex-col gap-2.5 text-sm">
 					<span>1. Go to your new server and run the following command</span>
 					<span className="bg-muted rounded-lg p-2 flex justify-between">
-						curl https://get.docker.com | sh -s -- --version 24.0
+						curl https://get.docker.com | sh -s -- --version {data?.version}
 						<button
 							type="button"
 							className="self-center"
 							onClick={() => {
-								copy("curl https://get.docker.com | sh -s -- --version 24.0");
+								copy(`curl https://get.docker.com | sh -s -- --version ${data?.version}`);
 								toast.success("Copied to clipboard");
 							}}
 						>
@@ -42,12 +42,12 @@ export const AddWorker = () => {
 					</span>
 
 					<span className="bg-muted rounded-lg p-2  flex">
-						{data}
+						{data?.command}
 						<button
 							type="button"
 							className="self-start"
 							onClick={() => {
-								copy(data || "");
+								copy(data?.command || "");
 								toast.success("Copied to clipboard");
 							}}
 						>
diff --git a/apps/dokploy/server/api/routers/cluster.ts b/apps/dokploy/server/api/routers/cluster.ts
index 6bd71ca9..c0b3cb12 100644
--- a/apps/dokploy/server/api/routers/cluster.ts
+++ b/apps/dokploy/server/api/routers/cluster.ts
@@ -35,14 +35,22 @@ export const clusterRouter = createTRPCRouter({
 		}),
 	addWorker: protectedProcedure.query(async ({ input }) => {
 		const result = await docker.swarmInspect();
-		return `docker swarm join --token ${
-			result.JoinTokens.Worker
-		} ${await getPublicIpWithFallback()}:2377`;
+		const docker_version = await docker.version();
+
+		return {
+			command: `docker swarm join --token ${result.JoinTokens.Worker
+				} ${await getPublicIpWithFallback()}:2377`,
+			version: docker_version.Version,
+		};
 	}),
 	addManager: protectedProcedure.query(async ({ input }) => {
 		const result = await docker.swarmInspect();
-		return `docker swarm join --token ${
-			result.JoinTokens.Manager
-		} ${await getPublicIpWithFallback()}:2377`;
+		const docker_version = await docker.version();
+		return {
+			command: `docker swarm join --token ${result.JoinTokens.Manager
+				} ${await getPublicIpWithFallback()}:2377`,
+			version: docker_version.Version,
+		}
+			;
 	}),
 });

From 68b81cb48d883ce9cc9db9b9475109300f022d52 Mon Sep 17 00:00:00 2001
From: Erick Luis <erickluis00@hotmail.com>
Date: Sun, 18 Aug 2024 22:40:05 +0000
Subject: [PATCH 2/2] pnpm run check

---
 .../settings/cluster/nodes/manager/add-manager.tsx  |  4 +++-
 .../settings/cluster/nodes/workers/add-worker.tsx   |  4 +++-
 apps/dokploy/server/api/routers/cluster.ts          | 13 +++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx
index b4c25c88..d6bce459 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/manager/add-manager.tsx
@@ -28,7 +28,9 @@ export const AddManager = () => {
 								type="button"
 								className="self-center"
 								onClick={() => {
-									copy(`curl https://get.docker.com | sh -s -- --version ${data?.version}`);
+									copy(
+										`curl https://get.docker.com | sh -s -- --version ${data?.version}`,
+									);
 									toast.success("Copied to clipboard");
 								}}
 							>
diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx
index 029b2c5f..50750f7e 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/add-worker.tsx
@@ -27,7 +27,9 @@ export const AddWorker = () => {
 							type="button"
 							className="self-center"
 							onClick={() => {
-								copy(`curl https://get.docker.com | sh -s -- --version ${data?.version}`);
+								copy(
+									`curl https://get.docker.com | sh -s -- --version ${data?.version}`,
+								);
 								toast.success("Copied to clipboard");
 							}}
 						>
diff --git a/apps/dokploy/server/api/routers/cluster.ts b/apps/dokploy/server/api/routers/cluster.ts
index c0b3cb12..7294c902 100644
--- a/apps/dokploy/server/api/routers/cluster.ts
+++ b/apps/dokploy/server/api/routers/cluster.ts
@@ -38,8 +38,9 @@ export const clusterRouter = createTRPCRouter({
 		const docker_version = await docker.version();
 
 		return {
-			command: `docker swarm join --token ${result.JoinTokens.Worker
-				} ${await getPublicIpWithFallback()}:2377`,
+			command: `docker swarm join --token ${
+				result.JoinTokens.Worker
+			} ${await getPublicIpWithFallback()}:2377`,
 			version: docker_version.Version,
 		};
 	}),
@@ -47,10 +48,10 @@ export const clusterRouter = createTRPCRouter({
 		const result = await docker.swarmInspect();
 		const docker_version = await docker.version();
 		return {
-			command: `docker swarm join --token ${result.JoinTokens.Manager
-				} ${await getPublicIpWithFallback()}:2377`,
+			command: `docker swarm join --token ${
+				result.JoinTokens.Manager
+			} ${await getPublicIpWithFallback()}:2377`,
 			version: docker_version.Version,
-		}
-			;
+		};
 	}),
 });