fix: address PR review — target deploy host for hooks, return container id from swarm wait, drop dead export

Author: Alfredao

apps/dokploy/__test__/deploy/application.deploy-hooks.test.ts

@@ -196,7 +196,7 @@ const primeMocks = (app = createMockApplication()) => {
 	vi.mocked(deploymentService.updateDeployment).mockResolvedValue({} as any);
 	vi.mocked(hooks.runDeployHook).mockResolvedValue(undefined as any);
 	vi.mocked(hooks.waitForSwarmServiceRunning).mockResolvedValue(
-		undefined as any,
+		"container-id-abc",
 	);
 };
 
@@ -254,6 +254,7 @@ describe("deployApplication - Deploy Hooks", () => {
 		);
 		vi.mocked(hooks.waitForSwarmServiceRunning).mockImplementation(async () => {
 			order.push("wait");
+			return "container-id-abc";
 		});
 		vi.mocked(hooks.runDeployHook).mockImplementation(async ({ kind }) => {
 			order.push(`hook:${kind}`);
@@ -270,6 +271,7 @@ describe("deployApplication - Deploy Hooks", () => {
 			expect.objectContaining({
 				kind: "post",
 				command: "npm run migrate",
+				containerId: "container-id-abc",
 			}),
 		);
 	});

packages/server/src/services/application.ts

@@ -239,16 +239,19 @@ export const deployApplication = async ({
 		await mechanizeDockerContainer(application);
 
 		if (deployHooks.post?.trim()) {
-			await waitForSwarmServiceRunning(application.appName, application.serverId);
+			const containerId = await waitForSwarmServiceRunning(
+				application.appName,
+				application.serverId,
+			);
 			await runDeployHook({
 				kind: "post",
 				appName: application.appName,
 				serverId: application.serverId,
 				command: deployHooks.post,
 				logPath: deployment.logPath,
+				containerId,
 			});
 		}
-		}
 
 		await updateDeploymentStatus(deployment.deploymentId, "done");
 		await updateApplicationStatus(applicationId, "done");
@@ -346,21 +349,25 @@ export const rebuildApplication = async ({
 		await runDeployHook({
 			kind: "pre",
 			appName: application.appName,
-			serverId,
+			serverId: application.serverId,
 			command: deployHooks.pre,
 			logPath: deployment.logPath,
 		});
 
 		await mechanizeDockerContainer(application);
 
 		if (deployHooks.post?.trim()) {
-			await waitForSwarmServiceRunning(application.appName, serverId);
+			const containerId = await waitForSwarmServiceRunning(
+				application.appName,
+				application.serverId,
+			);
 			await runDeployHook({
 				kind: "post",
 				appName: application.appName,
-				serverId,
+				serverId: application.serverId,
 				command: deployHooks.post,
 				logPath: deployment.logPath,
+				containerId,
 			});
 		}
 

packages/server/src/utils/docker/hooks.ts

@@ -27,26 +27,20 @@ export const parseDeployHooks = (
 	return {};
 };
 
-export const serializeDeployHooks = (hooks: DeployHooks): string | null => {
-	const pre = hooks.pre?.trim();
-	const post = hooks.post?.trim();
-	if (!pre && !post) return null;
-	return JSON.stringify({
-		...(pre ? { pre } : {}),
-		...(post ? { post } : {}),
-	});
-};
-
 interface WaitOptions {
 	timeoutMs?: number;
 	intervalMs?: number;
 }
 
+// Polls a swarm service until a task reaches `State: running` and returns that
+// task's container ID. Returning the resolved container ID directly avoids
+// racing against `listContainers` during `start-first` rolling updates, where
+// both the old and new task briefly share the service label.
 export const waitForSwarmServiceRunning = async (
 	appName: string,
 	serverId: string | null | undefined,
 	{ timeoutMs = 120_000, intervalMs = 2_000 }: WaitOptions = {},
-): Promise<void> => {
+): Promise<string> => {
 	const deadline = Date.now() + timeoutMs;
 	const remoteDocker = await getRemoteDocker(serverId);
 
@@ -66,9 +60,14 @@ export const waitForSwarmServiceRunning = async (
 					}),
 				});
 				const runningTask = tasks.find((t) => t.Status?.State === "running");
-				if (runningTask) return;
-				const latestTask = tasks[0];
-				lastError = `Service task state: ${latestTask?.Status?.State ?? "unknown"}`;
+				const containerId = runningTask?.Status?.ContainerStatus?.ContainerID;
+				if (runningTask && containerId) return containerId;
+				if (runningTask && !containerId) {
+					lastError = "Running task has no container id yet";
+				} else {
+					const latestTask = tasks[0];
+					lastError = `Service task state: ${latestTask?.Status?.State ?? "unknown"}`;
+				}
 			} else {
 				lastError = "Service has 0 replicas";
 			}
@@ -92,6 +91,11 @@ interface RunDeployHookParams {
 	serverId: string | null | undefined;
 	command: string | null | undefined;
 	logPath: string;
+	// If provided, skip the label-based container lookup and exec against this
+	// container id directly. Post-deploy uses this to target the exact task
+	// that `waitForSwarmServiceRunning` observed as running, avoiding any
+	// ambiguity when multiple tasks briefly share the service label.
+	containerId?: string;
 }
 
 export const runDeployHook = async ({
@@ -100,30 +104,34 @@ export const runDeployHook = async ({
 	serverId,
 	command,
 	logPath,
+	containerId,
 }: RunDeployHookParams): Promise<void> => {
 	const trimmed = command?.trim();
 	if (!trimmed) return;
 
-	const container = await getServiceContainer(appName, serverId);
-
-	if (!container) {
-		if (kind === "pre") {
-			const skipLine = `echo "===== No previous container found; skipping pre-deploy hook =====" >> "${logPath}"`;
-			if (serverId) {
-				await execAsyncRemote(serverId, skipLine);
-			} else {
-				await execAsync(skipLine);
+	let resolvedContainerId = containerId;
+	if (!resolvedContainerId) {
+		const container = await getServiceContainer(appName, serverId);
+		if (!container) {
+			if (kind === "pre") {
+				const skipLine = `echo "===== No previous container found; skipping pre-deploy hook =====" >> "${logPath}"`;
+				if (serverId) {
+					await execAsyncRemote(serverId, skipLine);
+				} else {
+					await execAsync(skipLine);
+				}
+				return;
 			}
-			return;
+			throw new Error(
+				`post-deploy hook: no running container found for "${appName}"`,
+			);
 		}
-		throw new Error(
-			`post-deploy hook: no running container found for "${appName}"`,
-		);
+		resolvedContainerId = container.Id;
 	}
 
 	const label = kind === "pre" ? "pre-deploy" : "post-deploy";
 	const encoded = encodeBase64(trimmed);
-	const scriptWrapper = `hook_cmd=$(echo "${encoded}" | base64 -d) && docker exec "${container.Id}" sh -c "$hook_cmd"`;
+	const scriptWrapper = `hook_cmd=$(echo "${encoded}" | base64 -d) && docker exec "${resolvedContainerId}" sh -c "$hook_cmd"`;
 	const wrappedCommand = `(echo "===== Running ${label} hook (length=${trimmed.length} chars) =====" && ${scriptWrapper} && echo "===== ${label} hook finished =====") >> "${logPath}" 2>&1`;
 
 	if (serverId) {