From 6ca1d978d40bdecce94a2a1c34e696100d1ad11b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 5 Sep 2022 13:09:59 +0200
Subject: [PATCH] fix restart

---
 apps/api/src/lib/common.ts              | 4 ++--
 apps/api/src/routes/api/v1/handlers.ts  | 2 +-
 apps/ui/src/lib/components/Usage.svelte | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 215c5e093..7595083f1 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -1446,11 +1446,11 @@ export function convertTolOldVolumeNames(type) {
 export async function cleanupDockerStorage(dockerId, lowDiskSpace, force) {
 	// Cleanup old coolify images
 	try {
-		let { stdout: images } = await executeDockerCmd({ dockerId, command: `docker images coollabsio/coolify --filter before="coollabsio/coolify:${version}" -q | xargs` })
+		let { stdout: images } = await executeDockerCmd({ dockerId, command: `docker images coollabsio/coolify --filter before="coollabsio/coolify:${version}" -q | xargs -r` })
 
 		images = images.trim();
 		if (images) {
-			await executeDockerCmd({ dockerId, command: `docker rmi -f ${images}" -q | xargs` })
+			await executeDockerCmd({ dockerId, command: `docker rmi -f ${images}" -q | xargs -r` })
 		}
 	} catch (error) {
 		//console.log(error);
diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts
index 037d20ffa..2a03859a3 100644
--- a/apps/api/src/routes/api/v1/handlers.ts
+++ b/apps/api/src/routes/api/v1/handlers.ts
@@ -78,7 +78,7 @@ export async function restartCoolify(request: FastifyRequest<any>) {
 		const teamId = request.user.teamId;
 		if (teamId === '0') {
 			if (!isDev) {
-				await asyncExecShell(`docker restart coolify`);
+				asyncExecShell(`docker restart coolify`);
 				return {};
 			} else {
 				console.log('Restarting Coolify')
diff --git a/apps/ui/src/lib/components/Usage.svelte b/apps/ui/src/lib/components/Usage.svelte
index 715946952..e5437a1d5 100644
--- a/apps/ui/src/lib/components/Usage.svelte
+++ b/apps/ui/src/lib/components/Usage.svelte
@@ -42,6 +42,7 @@
 			loading.restart = true;
 			try {
 				await post(`/internal/restart`, {});
+				await asyncSleep(10000);
 				let reachable = false;
 				let tries = 0;
 				do {