Update drizzle-zod dependency and enhance deployment tracking features

- Downgraded the drizzle-zod package from version 0.7.1 to 0.5.1 for compatibility.
- Added new fields `startedAt` and `finishedAt` to the deployment schema to track deployment timing.
- Enhanced deployment creation logic to set `startedAt` and `finishedAt` timestamps during deployment processes.
- Improved the ShowDeployments and ShowSchedulesLogs components to display deployment duration using a new Badge component.
- Refactored deployment removal logic to streamline the process of cleaning up old deployments.

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

@@ -9,12 +9,13 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { type RouterOutputs, api } from "@/utils/api";
-import { RocketIcon } from "lucide-react";
+import { RocketIcon, Clock } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { CancelQueues } from "./cancel-queues";
 import { RefreshToken } from "./refresh-token";
 import { ShowDeployment } from "./show-deployment";
-
+import { Badge } from "@/components/ui/badge";
+import { formatDuration } from "../schedules/show-schedules-logs";
 interface Props {
 	applicationId: string;
 }
@@ -96,8 +97,23 @@ export const ShowDeployments = ({ applicationId }: Props) => {
 									)}
 								</div>
 								<div className="flex flex-col items-end gap-2">
-									<div className="text-sm capitalize text-muted-foreground">
+									<div className="text-sm capitalize text-muted-foreground flex items-center gap-2">
 										<DateTooltip date={deployment.createdAt} />
+										{deployment.startedAt && deployment.finishedAt && (
+											<Badge
+												variant="outline"
+												className="text-[10px] gap-1 flex items-center"
+											>
+												<Clock className="size-3" />
+												{formatDuration(
+													Math.floor(
+														(new Date(deployment.finishedAt).getTime() -
+															new Date(deployment.startedAt).getTime()) /
+															1000,
+													),
+												)}
+											</Badge>
+										)}
 									</div>
 
 									<Button

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

@@ -13,7 +13,8 @@ import {
 import type { RouterOutputs } from "@/utils/api";
 import { useState } from "react";
 import { ShowDeployment } from "../deployments/show-deployment";
-import { ClipboardList } from "lucide-react";
+import { ClipboardList, Clock } from "lucide-react";
+import { Badge } from "@/components/ui/badge";
 
 interface Props {
 	deployments: RouterOutputs["deployment"]["all"];
@@ -21,6 +22,13 @@ interface Props {
 	children?: React.ReactNode;
 }
 
+export const formatDuration = (seconds: number) => {
+	if (seconds < 60) return `${seconds}s`;
+	const minutes = Math.floor(seconds / 60);
+	const remainingSeconds = seconds % 60;
+	return `${minutes}m ${remainingSeconds}s`;
+};
+
 export const ShowSchedulesLogs = ({
 	deployments,
 	serverId,
@@ -73,8 +81,23 @@ export const ShowSchedulesLogs = ({
 									)}
 								</div>
 								<div className="flex flex-col items-end gap-2">
-									<div className="text-sm capitalize text-muted-foreground">
+									<div className="flex items-center gap-2 text-sm text-muted-foreground">
 										<DateTooltip date={deployment.createdAt} />
+										{deployment.startedAt && deployment.finishedAt && (
+											<Badge
+												variant="outline"
+												className="text-[10px] gap-1 flex items-center"
+											>
+												<Clock className="size-3" />
+												{formatDuration(
+													Math.floor(
+														(new Date(deployment.finishedAt).getTime() -
+															new Date(deployment.startedAt).getTime()) /
+															1000,
+													),
+												)}
+											</Badge>
+										)}
 									</div>
 
 									<Button

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

@@ -9,12 +9,13 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { type RouterOutputs, api } from "@/utils/api";
-import { RocketIcon } from "lucide-react";
+import { RocketIcon, Clock } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { CancelQueuesCompose } from "./cancel-queues-compose";
 import { RefreshTokenCompose } from "./refresh-token-compose";
 import { ShowDeploymentCompose } from "./show-deployment-compose";
-
+import { Badge } from "@/components/ui/badge";
+import { formatDuration } from "@/components/dashboard/application/schedules/show-schedules-logs";
 interface Props {
 	composeId: string;
 }
@@ -96,8 +97,23 @@ export const ShowDeploymentsCompose = ({ composeId }: Props) => {
 									)}
 								</div>
 								<div className="flex flex-col items-end gap-2">
-									<div className="text-sm capitalize text-muted-foreground">
+									<div className="text-sm capitalize text-muted-foreground flex items-center gap-2">
 										<DateTooltip date={deployment.createdAt} />
+										{deployment.startedAt && deployment.finishedAt && (
+											<Badge
+												variant="outline"
+												className="text-[10px] gap-1 flex items-center"
+											>
+												<Clock className="size-3" />
+												{formatDuration(
+													Math.floor(
+														(new Date(deployment.finishedAt).getTime() -
+															new Date(deployment.startedAt).getTime()) /
+															1000,
+													),
+												)}
+											</Badge>
+										)}
 									</div>
 
 									<Button

apps/dokploy/drizzle/0096_special_may_parker.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "deployment" ADD COLUMN "startedAt" text;--> statement-breakpoint
+ALTER TABLE "deployment" ADD COLUMN "finishedAt" text;

apps/dokploy/drizzle/meta/_journal.json

@@ -673,6 +673,13 @@
       "when": 1746232483345,
       "tag": "0095_friendly_cobalt_man",
       "breakpoints": true
+    },
+    {
+      "idx": 96,
+      "version": "7",
+      "when": 1746252086587,
+      "tag": "0096_special_may_parker",
+      "breakpoints": true
     }
   ]
 }

apps/dokploy/package.json

@@ -104,7 +104,7 @@
 		"dockerode": "4.0.2",
 		"dotenv": "16.4.5",
 		"drizzle-orm": "^0.39.1",
-		"drizzle-zod": "0.7.1",
+		"drizzle-zod": "0.5.1",
 		"fancy-ansi": "^0.1.3",
 		"hi-base32": "^0.5.1",
 		"i18next": "^23.16.4",

packages/server/package.json

@@ -54,7 +54,7 @@
     "dockerode": "4.0.2",
     "dotenv": "16.4.5",
     "drizzle-orm": "^0.39.1",
-    "drizzle-zod": "0.7.1",
+    "drizzle-zod": "0.5.1",
     "hi-base32": "^0.5.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",

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

@@ -47,6 +47,8 @@ export const deployments = pgTable("deployment", {
 	createdAt: text("createdAt")
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
+	startedAt: text("startedAt"),
+	finishedAt: text("finishedAt"),
 	errorMessage: text("errorMessage"),
 	scheduleId: text("scheduleId").references(
 		(): AnyPgColumn => schedules.scheduleId,

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

@@ -1,6 +1,6 @@
 import { relations } from "drizzle-orm";
 import { boolean, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
-import { createInsertSchema, createUpdateSchema } from "drizzle-zod";
+import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { applications } from "./application";
@@ -78,6 +78,6 @@ export const schedulesRelations = relations(schedules, ({ one, many }) => ({
 
 export const createScheduleSchema = createInsertSchema(schedules);
 
-export const updateScheduleSchema = createUpdateSchema(schedules).extend({
+export const updateScheduleSchema = createScheduleSchema.extend({
 	scheduleId: z.string().min(1),
 });

packages/server/src/services/deployment.ts

@@ -59,6 +59,7 @@ export const createDeployment = async (
 	try {
 		await removeLastTenDeployments(
 			deployment.applicationId,
+			"application",
 			application.serverId,
 		);
 		const { LOGS_PATH } = paths(!!application.serverId);
@@ -90,6 +91,7 @@ export const createDeployment = async (
 				status: "running",
 				logPath: logFilePath,
 				description: deployment.description || "",
+				startedAt: new Date().toISOString(),
 			})
 			.returning();
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
@@ -109,6 +111,8 @@ export const createDeployment = async (
 				logPath: "",
 				description: deployment.description || "",
 				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				startedAt: new Date().toISOString(),
+				finishedAt: new Date().toISOString(),
 			})
 			.returning();
 		await updateApplicationStatus(application.applicationId, "error");
@@ -130,8 +134,9 @@ export const createDeploymentPreview = async (
 		deployment.previewDeploymentId,
 	);
 	try {
-		await removeLastTenPreviewDeploymenById(
+		await removeLastTenDeployments(
 			deployment.previewDeploymentId,
+			"previewDeployment",
 			previewDeployment?.application?.serverId,
 		);
 
@@ -167,6 +172,7 @@ export const createDeploymentPreview = async (
 				logPath: logFilePath,
 				description: deployment.description || "",
 				previewDeploymentId: deployment.previewDeploymentId,
+				startedAt: new Date().toISOString(),
 			})
 			.returning();
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
@@ -186,6 +192,8 @@ export const createDeploymentPreview = async (
 				logPath: "",
 				description: deployment.description || "",
 				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				startedAt: new Date().toISOString(),
+				finishedAt: new Date().toISOString(),
 			})
 			.returning();
 		await updatePreviewDeployment(deployment.previewDeploymentId, {
@@ -207,8 +215,9 @@ export const createDeploymentCompose = async (
 ) => {
 	const compose = await findComposeById(deployment.composeId);
 	try {
-		await removeLastTenComposeDeployments(
+		await removeLastTenDeployments(
 			deployment.composeId,
+			"compose",
 			compose.serverId,
 		);
 		const { LOGS_PATH } = paths(!!compose.serverId);
@@ -240,6 +249,7 @@ echo "Initializing deployment" >> ${logFilePath};
 				description: deployment.description || "",
 				status: "running",
 				logPath: logFilePath,
+				startedAt: new Date().toISOString(),
 			})
 			.returning();
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
@@ -259,6 +269,8 @@ echo "Initializing deployment" >> ${logFilePath};
 				logPath: "",
 				description: deployment.description || "",
 				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				startedAt: new Date().toISOString(),
+				finishedAt: new Date().toISOString(),
 			})
 			.returning();
 		await updateCompose(compose.composeId, {
@@ -285,14 +297,13 @@ export const createDeploymentSchedule = async (
 			schedule.application?.serverId ||
 			schedule.compose?.serverId ||
 			schedule.server?.serverId;
-		await removeDeploymentsSchedule(deployment.scheduleId, serverId);
+		await removeLastTenDeployments(deployment.scheduleId, "schedule", serverId);
 		const { SCHEDULES_PATH } = paths(!!serverId);
 		const formattedDateTime = format(new Date(), "yyyy-MM-dd:HH:mm:ss");
 		const fileName = `${schedule.appName}-${formattedDateTime}.log`;
 		const logFilePath = path.join(SCHEDULES_PATH, schedule.appName, fileName);
 
 		if (serverId) {
-			console.log("serverId", serverId);
 			const server = await findServerById(serverId);
 
 			const command = `
@@ -316,6 +327,7 @@ export const createDeploymentSchedule = async (
 				status: "running",
 				logPath: logFilePath,
 				description: deployment.description || "",
+				startedAt: new Date().toISOString(),
 			})
 			.returning();
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
@@ -336,6 +348,8 @@ export const createDeploymentSchedule = async (
 				logPath: "",
 				description: deployment.description || "",
 				errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`,
+				startedAt: new Date().toISOString(),
+				finishedAt: new Date().toISOString(),
 			})
 			.returning();
 
@@ -372,144 +386,15 @@ export const removeDeploymentsByApplicationId = async (
 		.returning();
 };
 
-const removeLastTenDeployments = async (
+const getDeploymentsByType = async (
-	applicationId: string,
+	id: string,
-	serverId: string | null,
+	type: "application" | "compose" | "server" | "schedule" | "previewDeployment",
 ) => {
 	const deploymentList = await db.query.deployments.findMany({
-		where: eq(deployments.applicationId, applicationId),
+		where: eq(deployments[`${type}Id`], id),
 		orderBy: desc(deployments.createdAt),
 	});
-
+	return deploymentList;
-	if (deploymentList.length > 10) {
-		const deploymentsToDelete = deploymentList.slice(9);
-		if (serverId) {
-			let command = "";
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-
-				command += `
-				rm -rf ${logPath};
-				`;
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-
-			await execAsyncRemote(serverId, command);
-		} else {
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-				if (existsSync(logPath)) {
-					await fsPromises.unlink(logPath);
-				}
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-		}
-	}
-};
-
-const removeLastTenComposeDeployments = async (
-	composeId: string,
-	serverId: string | null,
-) => {
-	const deploymentList = await db.query.deployments.findMany({
-		where: eq(deployments.composeId, composeId),
-		orderBy: desc(deployments.createdAt),
-	});
-	if (deploymentList.length > 10) {
-		if (serverId) {
-			let command = "";
-			const deploymentsToDelete = deploymentList.slice(9);
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-
-				command += `
-				rm -rf ${logPath};
-				`;
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-
-			await execAsyncRemote(serverId, command);
-		} else {
-			const deploymentsToDelete = deploymentList.slice(9);
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-				if (existsSync(logPath)) {
-					await fsPromises.unlink(logPath);
-				}
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-		}
-	}
-};
-
-export const removeLastTenPreviewDeploymenById = async (
-	previewDeploymentId: string,
-	serverId: string | null,
-) => {
-	const deploymentList = await db.query.deployments.findMany({
-		where: eq(deployments.previewDeploymentId, previewDeploymentId),
-		orderBy: desc(deployments.createdAt),
-	});
-
-	if (deploymentList.length > 10) {
-		const deploymentsToDelete = deploymentList.slice(9);
-		if (serverId) {
-			let command = "";
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-
-				command += `
-				rm -rf ${logPath};
-				`;
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-
-			await execAsyncRemote(serverId, command);
-		} else {
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-				if (existsSync(logPath)) {
-					await fsPromises.unlink(logPath);
-				}
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-		}
-	}
-};
-
-export const removeDeploymentsSchedule = async (
-	scheduleId: string,
-	serverId?: string | null,
-) => {
-	const deploymentList = await db.query.deployments.findMany({
-		where: eq(deployments.scheduleId, scheduleId),
-		orderBy: desc(deployments.createdAt),
-	});
-
-	if (deploymentList.length > 10) {
-		const deploymentsToDelete = deploymentList.slice(9);
-		if (serverId) {
-			let command = "";
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-
-				command += `
-				rm -rf ${logPath};
-				`;
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-
-			await execAsyncRemote(serverId, command);
-		} else {
-			for (const oldDeployment of deploymentsToDelete) {
-				const logPath = path.join(oldDeployment.logPath);
-				if (existsSync(logPath)) {
-					await fsPromises.unlink(logPath);
-				}
-				await removeDeployment(oldDeployment.deploymentId);
-			}
-		}
-	}
 };
 
 export const removeDeployments = async (application: Application) => {
@@ -524,6 +409,38 @@ export const removeDeployments = async (application: Application) => {
 	await removeDeploymentsByApplicationId(applicationId);
 };
 
+const removeLastTenDeployments = async (
+	id: string,
+	type: "application" | "compose" | "server" | "schedule" | "previewDeployment",
+	serverId?: string | null,
+) => {
+	const deploymentList = await getDeploymentsByType(id, type);
+	if (deploymentList.length > 10) {
+		const deploymentsToDelete = deploymentList.slice(10);
+		if (serverId) {
+			let command = "";
+			for (const oldDeployment of deploymentsToDelete) {
+				const logPath = path.join(oldDeployment.logPath);
+
+				command += `
+				rm -rf ${logPath};
+				`;
+				await removeDeployment(oldDeployment.deploymentId);
+			}
+
+			await execAsyncRemote(serverId, command);
+		} else {
+			for (const oldDeployment of deploymentsToDelete) {
+				const logPath = path.join(oldDeployment.logPath);
+				if (existsSync(logPath)) {
+					await fsPromises.unlink(logPath);
+				}
+				await removeDeployment(oldDeployment.deploymentId);
+			}
+		}
+	}
+};
+
 export const removeDeploymentsByPreviewDeploymentId = async (
 	previewDeployment: PreviewDeployment,
 	serverId: string | null,
@@ -605,6 +522,10 @@ export const updateDeploymentStatus = async (
 		.update(deployments)
 		.set({
 			status: deploymentStatus,
+			finishedAt:
+				deploymentStatus === "done" || deploymentStatus === "error"
+					? new Date().toISOString()
+					: null,
 		})
 		.where(eq(deployments.deploymentId, deploymentId))
 		.returning();

pnpm-lock.yaml

@@ -302,8 +302,8 @@ importers:
         specifier: ^0.39.1
         version: 0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7)
       drizzle-zod:
-        specifier: 0.7.1
+        specifier: 0.5.1
-        version: 0.7.1(drizzle-orm@0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7))(zod@3.23.8)
+        version: 0.5.1(drizzle-orm@0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7))(zod@3.23.8)
       fancy-ansi:
         specifier: ^0.1.3
         version: 0.1.3
@@ -664,8 +664,8 @@ importers:
         specifier: ^0.39.1
         version: 0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7)
       drizzle-zod:
-        specifier: 0.7.1
+        specifier: 0.5.1
-        version: 0.7.1(drizzle-orm@0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7))(zod@3.23.8)
+        version: 0.5.1(drizzle-orm@0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7))(zod@3.23.8)
       hi-base32:
         specifier: ^0.5.1
         version: 0.5.1
@@ -4549,11 +4549,11 @@ packages:
       sqlite3:
         optional: true
 
-  drizzle-zod@0.7.1:
+  drizzle-zod@0.5.1:
-    resolution: {integrity: sha512-nZzALOdz44/AL2U005UlmMqaQ1qe5JfanvLujiTHiiT8+vZJTBFhj3pY4Vk+L6UWyKFfNmLhk602Hn4kCTynKQ==}
+    resolution: {integrity: sha512-C/8bvzUH/zSnVfwdSibOgFjLhtDtbKYmkbPbUCq46QZyZCH6kODIMSOgZ8R7rVjoI+tCj3k06MRJMDqsIeoS4A==}
     peerDependencies:
-      drizzle-orm: '>=0.36.0'
+      drizzle-orm: '>=0.23.13'
-      zod: '>=3.0.0'
+      zod: '*'
 
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
@@ -11191,7 +11191,7 @@ snapshots:
       react: 18.2.0
       sqlite3: 5.1.7
 
-  drizzle-zod@0.7.1(drizzle-orm@0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7))(zod@3.23.8):
+  drizzle-zod@0.5.1(drizzle-orm@0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7))(zod@3.23.8):
     dependencies:
       drizzle-orm: 0.39.1(@opentelemetry/api@1.9.0)(@types/react@18.3.5)(kysely@0.27.6)(postgres@3.4.4)(react@18.2.0)(sqlite3@5.1.7)
       zod: 3.23.8