From ebde77008c0fda6de60127f175b6a1a1c2456301 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 2 Mar 2022 15:52:06 +0100
Subject: [PATCH] Cleanup coolify image fix

---
 src/lib/queues/cleanup.ts | 8 ++++++--
 src/lib/queues/index.ts   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/lib/queues/cleanup.ts b/src/lib/queues/cleanup.ts
index 5a338c63f..31d4507be 100644
--- a/src/lib/queues/cleanup.ts
+++ b/src/lib/queues/cleanup.ts
@@ -6,10 +6,14 @@ export default async function () {
 	const destinationDockers = await prisma.destinationDocker.findMany();
 	for (const destinationDocker of destinationDockers) {
 		const host = getEngine(destinationDocker.engine);
+		// Cleanup old coolify images
 		try {
-			await asyncExecShell(
-				`DOCKER_HOST=${host} docker rmi $(docker images coollabsio/coolify --filter before="coollabsio/coolify:latest" -q)`
+			const { stdout: images } = await asyncExecShell(
+				`DOCKER_HOST=${host} docker images coollabsio/coolify --filter before="coollabsio/coolify:latest" -q`
 			);
+			if (images) {
+				await asyncExecShell(`DOCKER_HOST=${host} docker rmi ${images}`);
+			}
 		} catch (error) {
 			console.log(error);
 		}
diff --git a/src/lib/queues/index.ts b/src/lib/queues/index.ts
index 1ce9411c4..f002547e8 100644
--- a/src/lib/queues/index.ts
+++ b/src/lib/queues/index.ts
@@ -87,7 +87,7 @@ const cron = async () => {
 
 	await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } });
 	await queue.ssl.add('ssl', {}, { repeat: { every: 60000 } });
-	await queue.cleanup.add('cleanup', {}, { repeat: { every: 600000 } });
+	await queue.cleanup.add('cleanup', {}, { repeat: { every: 300000 } });
 	await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
 
 	const events = {