Merge branch 'canary' into 394-ability-to-backup-named-volume-to-s3

apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx

@@ -62,6 +62,8 @@ export const ShowDeployments = ({
 
 	const { mutateAsync: rollback, isLoading: isRollingBack } =
 		api.rollback.rollback.useMutation();
+	const { mutateAsync: killProcess, isLoading: isKillingProcess } =
+		api.deployment.killProcess.useMutation();
 
 	const [url, setUrl] = React.useState("");
 	useEffect(() => {
@@ -170,6 +172,32 @@ export const ShowDeployments = ({
 									</div>
 
 									<div className="flex flex-row items-center gap-2">
+										{deployment.pid && deployment.status === "running" && (
+											<DialogAction
+												title="Kill Process"
+												description="Are you sure you want to kill the process?"
+												type="default"
+												onClick={async () => {
+													await killProcess({
+														deploymentId: deployment.deploymentId,
+													})
+														.then(() => {
+															toast.success("Process killed successfully");
+														})
+														.catch(() => {
+															toast.error("Error killing process");
+														});
+												}}
+											>
+												<Button
+													variant="destructive"
+													size="sm"
+													isLoading={isKillingProcess}
+												>
+													Kill Process
+												</Button>
+											</DialogAction>
+										)}
 										<Button
 											onClick={() => {
 												setActiveLog(deployment);

apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx

@@ -166,12 +166,16 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => {
 
 															await runManually({
 																scheduleId: schedule.scheduleId,
-															}).then(async () => {
-																await new Promise((resolve) =>
-																	setTimeout(resolve, 1500),
-																);
-																refetchSchedules();
-															});
+															})
+																.then(async () => {
+																	await new Promise((resolve) =>
+																		setTimeout(resolve, 1500),
+																	);
+																	refetchSchedules();
+																})
+																.catch(() => {
+																	toast.error("Error running schedule");
+																});
 														}}
 													>
 														<Play className="size-4  transition-colors" />

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

@@ -20,7 +20,7 @@ export const ShowNodesModal = ({ serverId }: Props) => {
 					Show Swarm Nodes
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-5xl  overflow-y-auto max-h-screen ">
+			<DialogContent className="min-w-[70vw] overflow-y-auto max-h-screen">
 				<div className="grid w-full gap-1">
 					<ShowNodes serverId={serverId} />
 				</div>

apps/dokploy/components/ui/badge.tsx

@@ -4,7 +4,7 @@ import type * as React from "react";
 import { cn } from "@/lib/utils";
 
 const badgeVariants = cva(
-	"inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+	"inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold whitespace-nowrap transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
 	{
 		variants: {
 			variant: {

apps/dokploy/drizzle/0098_conscious_chat.sql

@@ -0,0 +1 @@
+ALTER TABLE "deployment" ADD COLUMN "pid" text;

apps/dokploy/drizzle/meta/_journal.json

@@ -687,6 +687,13 @@
       "when": 1750567641441,
       "tag": "0097_hard_lizard",
       "breakpoints": true
+    },
+    {
+      "idx": 98,
+      "version": "7",
+      "when": 1751233265357,
+      "tag": "0098_conscious_chat",
+      "breakpoints": true
     }
   ]
 }

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

@@ -7,16 +7,21 @@ import {
 	deployments,
 } from "@/server/db/schema";
 import {
+	execAsync,
+	execAsyncRemote,
 	findAllDeploymentsByApplicationId,
 	findAllDeploymentsByComposeId,
 	findAllDeploymentsByServerId,
 	findApplicationById,
 	findComposeById,
+	findDeploymentById,
 	findServerById,
+	updateDeploymentStatus,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { desc, eq } from "drizzle-orm";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { z } from "zod";
 
 export const deploymentRouter = createTRPCRouter({
 	all: protectedProcedure
@@ -72,4 +77,30 @@ export const deploymentRouter = createTRPCRouter({
 
 			return deploymentsList;
 		}),
+
+	killProcess: protectedProcedure
+		.input(
+			z.object({
+				deploymentId: z.string().min(1),
+			}),
+		)
+		.mutation(async ({ input }) => {
+			const deployment = await findDeploymentById(input.deploymentId);
+
+			if (!deployment.pid) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message: "Deployment is not running",
+				});
+			}
+
+			const command = `kill -9 ${deployment.pid}`;
+			if (deployment.schedule?.serverId) {
+				await execAsyncRemote(deployment.schedule.serverId, command);
+			} else {
+				await execAsync(command);
+			}
+
+			await updateDeploymentStatus(deployment.deploymentId, "error");
+		}),
 });