From b3e2af3b40468bd8bcdd0a1f2849aace84a7a686 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 3 May 2025 13:36:49 -0600
Subject: [PATCH] Remove unused backup utility and refactor service container
 retrieval

- Deleted the `createBackupLabels` function from the backup utilities as it was no longer needed.
- Removed the `getServiceContainerIV2` function from the Docker utilities and updated references to use the existing `getServiceContainer` function, streamlining the codebase and improving maintainability.
---
 packages/server/src/utils/docker/backup.ts   |  4 ----
 packages/server/src/utils/docker/utils.ts    | 25 --------------------
 packages/server/src/utils/schedules/utils.ts |  4 ++--
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 packages/server/src/utils/docker/backup.ts

diff --git a/packages/server/src/utils/docker/backup.ts b/packages/server/src/utils/docker/backup.ts
deleted file mode 100644
index 753314ac6..000000000
--- a/packages/server/src/utils/docker/backup.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const createBackupLabels = (backupId: string) => {
-	const labels = [`dokploy.backup.id=${backupId}`];
-	return labels;
-};
diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts
index 3419e300e..12d23043e 100644
--- a/packages/server/src/utils/docker/utils.ts
+++ b/packages/server/src/utils/docker/utils.ts
@@ -520,31 +520,6 @@ export const getServiceContainer = async (
 	}
 };
 
-export const getServiceContainerIV2 = async (
-	appName: string,
-	serverId?: string | null,
-) => {
-	try {
-		const filter = {
-			status: ["running"],
-			label: [`com.docker.swarm.service.name=${appName}`],
-		};
-		const remoteDocker = await getRemoteDocker(serverId);
-		const containers = await remoteDocker.listContainers({
-			filters: JSON.stringify(filter),
-		});
-
-		if (containers.length === 0 || !containers[0]) {
-			throw new Error(`No container found with name: ${appName}`);
-		}
-
-		const container = containers[0];
-		return container;
-	} catch (error) {
-		throw error;
-	}
-};
-
 export const getComposeContainer = async (
 	compose: Compose,
 	serviceName: string,
diff --git a/packages/server/src/utils/schedules/utils.ts b/packages/server/src/utils/schedules/utils.ts
index 14c322136..19513c1b9 100644
--- a/packages/server/src/utils/schedules/utils.ts
+++ b/packages/server/src/utils/schedules/utils.ts
@@ -1,7 +1,7 @@
 import type { Schedule } from "@dokploy/server/db/schema/schedule";
 import { findScheduleById } from "@dokploy/server/services/schedule";
 import { scheduledJobs, scheduleJob as scheduleJobNode } from "node-schedule";
-import { getComposeContainer, getServiceContainerIV2 } from "../docker/utils";
+import { getComposeContainer, getServiceContainer } from "../docker/utils";
 import { execAsyncRemote } from "../process/execAsync";
 import { spawnAsync } from "../process/spawnAsync";
 import { createDeploymentSchedule } from "@dokploy/server/services/deployment";
@@ -45,7 +45,7 @@ export const runCommand = async (scheduleId: string) => {
 		let containerId = "";
 		let serverId = "";
 		if (scheduleType === "application" && application) {
-			const container = await getServiceContainerIV2(
+			const container = await getServiceContainer(
 				application.appName,
 				application.serverId,
 			);