From d09163a24edc2cc4d1cd26001e066b0b302e3689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D1=84=D1=8B=D1=80=D0=B0=D1=82=20=D1=91=D0=B7=D0=B4=D1=8D?=
 =?UTF-8?q?=D0=BD?= <31664778+fir4tozden@users.noreply.github.com>
Date: Sun, 30 Nov 2025 21:30:08 +0300
Subject: [PATCH] chore: using new method dockerSafeExec()

---
 packages/server/src/services/settings.ts | 67 ++++++------------------
 1 file changed, 17 insertions(+), 50 deletions(-)

diff --git a/packages/server/src/services/settings.ts b/packages/server/src/services/settings.ts
index c55384d07..14d6962e2 100644
--- a/packages/server/src/services/settings.ts
+++ b/packages/server/src/services/settings.ts
@@ -10,6 +10,7 @@ import {
 	initializeTraefikService,
 	type TraefikOptions,
 } from "../setup/traefik-setup";
+import { dockerSafeExec } from "@dokploy/server/utils/docker/utils.ts";
 
 export interface IUpdateData {
 	latestVersion: string | null;
@@ -226,58 +227,24 @@ export const cleanupFullDocker = async (serverId?: string | null) => {
 		if (serverId) {
 			await execAsyncRemote(
 				serverId,
-				`
-CHECK_INTERVAL=10
-
-echo "Starting Docker cleanup..."
-
-while true; do
-    PROCESSES=$(ps aux | grep -E "docker build|docker pull" | grep -v grep)
-
-    if [ -z "$PROCESSES" ]; then
-        echo "Docker is idle. Starting cleanup..."
-        break
-    else
-        echo "Docker is busy. Will check again in $CHECK_INTERVAL seconds..."
-        sleep $CHECK_INTERVAL
-    fi
-done
-
-${cleanupImages}
-${cleanupVolumes}
-${cleanupContainers}
-${cleanupSystem}
-${cleanupBuilder}
-
-echo "Docker cleanup completed."
-			`,
-			);
+				dockerSafeExec(`
+					${cleanupImages}
+					${cleanupVolumes}
+					${cleanupContainers}
+					${cleanupSystem}
+					${cleanupBuilder}
+				`));
 		}
-		await execAsync(`
-CHECK_INTERVAL=10
 
-echo "Starting Docker cleanup..."
-
-while true; do
-    PROCESSES=$(ps aux | grep -E "docker build|docker pull" | grep -v grep)
-
-    if [ -z "$PROCESSES" ]; then
-        echo "Docker is idle. Starting cleanup..."
-        break
-    else
-        echo "Docker is busy. Will check again in $CHECK_INTERVAL seconds..."
-        sleep $CHECK_INTERVAL
-    fi
-done
-
-${cleanupImages}
-${cleanupVolumes}
-${cleanupContainers}
-${cleanupSystem}
-${cleanupBuilder}
-
-echo "Docker cleanup completed."
-					`);
+		await execAsync(
+			dockerSafeExec(`
+				${cleanupImages}
+				${cleanupVolumes}
+				${cleanupContainers}
+				${cleanupSystem}
+				${cleanupBuilder}
+			`)
+		);
 	} catch (error) {
 		console.log(error);
 	}