From d6d3fb46cc4679562e35d229a6aac0784f10503e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 07:14:17 +0000
Subject: [PATCH 1/8] fix: volumes for services

---
 apps/api/src/lib/services/handlers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/api/src/lib/services/handlers.ts b/apps/api/src/lib/services/handlers.ts
index f2f0aafa9..903f53035 100644
--- a/apps/api/src/lib/services/handlers.ts
+++ b/apps/api/src/lib/services/handlers.ts
@@ -655,7 +655,7 @@ async function startLanguageToolService(request: FastifyRequest<ServiceStartStop
                     image: config.languagetool.image,
                     environment: config.languagetool.environmentVariables,
                     ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
-                    volumes: config.languagetool,
+                    volumes: config.languagetool.volumes,
                     labels: makeLabelForServices('languagetool'),
                     ...defaultComposeConfiguration(network),
                 }
@@ -710,7 +710,7 @@ async function startN8nService(request: FastifyRequest<ServiceStartStop>) {
                 [id]: {
                     container_name: id,
                     image: config.n8n.image,
-                    volumes: config.n8n,
+                    volumes: config.n8n.volumes,
                     environment: config.n8n.environmentVariables,
                     labels: makeLabelForServices('n8n'),
                     ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),

From bc66b98176f9e72ae1217e2fdfcaffa79badd299 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 07:14:30 +0000
Subject: [PATCH 2/8] fix: build secrets for apps

---
 apps/api/src/lib/buildPacks/common.ts | 3 ---
 apps/api/src/lib/buildPacks/docker.ts | 1 +
 apps/api/src/lib/buildPacks/node.ts   | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts
index f4195e24a..0e188ae36 100644
--- a/apps/api/src/lib/buildPacks/common.ts
+++ b/apps/api/src/lib/buildPacks/common.ts
@@ -556,7 +556,6 @@ export function checkPnpm(installCommand = null, buildCommand = null, startComma
 	);
 }
 
-
 export async function buildImage({
 	applicationId,
 	tag,
@@ -677,8 +676,6 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 		secrets,
 		pullmergeRequestId
 	} = data;
-
-
 	const isPnpm = checkPnpm(installCommand, buildCommand);
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild}`);
diff --git a/apps/api/src/lib/buildPacks/docker.ts b/apps/api/src/lib/buildPacks/docker.ts
index 04041b190..c017b4bed 100644
--- a/apps/api/src/lib/buildPacks/docker.ts
+++ b/apps/api/src/lib/buildPacks/docker.ts
@@ -28,6 +28,7 @@ export default async function (data) {
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
 				if (secret.isBuildSecret) {
+					// TODO: fix secrets
 					if (
 						(pullmergeRequestId && secret.isPRMRSecret) ||
 						(!pullmergeRequestId && !secret.isPRMRSecret)
diff --git a/apps/api/src/lib/buildPacks/node.ts b/apps/api/src/lib/buildPacks/node.ts
index 546942542..ab064ae87 100644
--- a/apps/api/src/lib/buildPacks/node.ts
+++ b/apps/api/src/lib/buildPacks/node.ts
@@ -22,6 +22,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
 			if (secret.isBuildSecret) {
+				console.log(secret)
 				if (pullmergeRequestId) {
 					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
 					if (isSecretFound.length > 0) {

From 39e24bdc9703cab1ed10986ab79fc9ba4999d592 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 07:17:20 +0000
Subject: [PATCH 3/8] remove console logs

---
 apps/api/src/lib/buildPacks/node.ts               | 1 -
 apps/ui/src/routes/applications/[id]/index.svelte | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/api/src/lib/buildPacks/node.ts b/apps/api/src/lib/buildPacks/node.ts
index ab064ae87..546942542 100644
--- a/apps/api/src/lib/buildPacks/node.ts
+++ b/apps/api/src/lib/buildPacks/node.ts
@@ -22,7 +22,6 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
 			if (secret.isBuildSecret) {
-				console.log(secret)
 				if (pullmergeRequestId) {
 					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
 					if (isSecretFound.length > 0) {
diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte
index ec6a15318..ed5a70f4d 100644
--- a/apps/ui/src/routes/applications/[id]/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/index.svelte
@@ -220,7 +220,6 @@
 		loading = true;
 		try {
 			nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
-			console.log({debug: nonWWWDomain})
 			if (application.deploymentType)
 				application.deploymentType = application.deploymentType.toLowerCase();
 			!isBot &&

From 21b499065243710999305f1fb9387b943b857173 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 07:29:51 +0000
Subject: [PATCH 4/8] ui: fix follow button

---
 apps/ui/src/routes/databases/[id]/logs/index.svelte | 2 +-
 apps/ui/src/routes/services/[id]/logs/index.svelte  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/routes/databases/[id]/logs/index.svelte b/apps/ui/src/routes/databases/[id]/logs/index.svelte
index ee5df54ed..0a296487f 100644
--- a/apps/ui/src/routes/databases/[id]/logs/index.svelte
+++ b/apps/ui/src/routes/databases/[id]/logs/index.svelte
@@ -112,7 +112,7 @@
 				<button
 					id="follow"
 					on:click={followBuild}
-					class="bg-transparent btn btn-sm"
+					class="bg-transparent btn btn-sm btn-link"
 					class:text-green-500={followingLogs}
 				>
 					<svg
diff --git a/apps/ui/src/routes/services/[id]/logs/index.svelte b/apps/ui/src/routes/services/[id]/logs/index.svelte
index bb9c775c3..dc875852e 100644
--- a/apps/ui/src/routes/services/[id]/logs/index.svelte
+++ b/apps/ui/src/routes/services/[id]/logs/index.svelte
@@ -128,7 +128,7 @@
 				<button
 					id="follow"
 					on:click={followBuild}
-					class="bg-transparent btn btn-sm"
+					class="bg-transparent btn btn-sm btn-link"
 					class:text-green-500={followingLogs}
 				>
 					<svg

From d844026c2985d49208f48fd70d8505d12e130f95 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 07:41:36 +0000
Subject: [PATCH 5/8] dev: arm should be on next all the time

---
 apps/api/src/routes/api/v1/handlers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts
index cdb115af3..4e877f13c 100644
--- a/apps/api/src/routes/api/v1/handlers.ts
+++ b/apps/api/src/routes/api/v1/handlers.ts
@@ -26,7 +26,7 @@ export async function cleanupManually(request: FastifyRequest) {
 }
 export async function checkUpdate(request: FastifyRequest) {
 	try {
-		const isStaging = request.hostname === 'staging.coolify.io'
+		const isStaging = request.hostname === 'staging.coolify.io' || request.hostname === 'arm.coolify.io'
 		const currentVersion = version;
 		const { data: versions } = await axios.get(
 			`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}`

From b469d2832d15dfb11d514ec3d1c8ac0e927cce55 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 07:58:56 +0000
Subject: [PATCH 6/8] fix: delete resource use window location

---
 apps/ui/src/routes/applications/[id]/__layout.svelte | 2 +-
 apps/ui/src/routes/databases/[id]/__layout.svelte    | 2 +-
 apps/ui/src/routes/services/[id]/__layout.svelte     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index 89127fce6..546af6e90 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -107,7 +107,7 @@
 			$status.application.initialLoading = true;
 			try {
 				await del(`/applications/${id}`, { id, force });
-				return await goto(`/`, { replaceState: true });
+				return await window.location.assign(`/`);
 			} catch (error) {
 				if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
 					forceDelete = true;
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index 034e2c0a9..322ad590d 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -76,7 +76,7 @@
 			$status.database.initialLoading = true;
 			try {
 				await del(`/databases/${database.id}`, { id: database.id, force });
-				return await goto('/', { replaceState: true });
+				return await window.location.assign('/');
 			} catch (error) {
 				return errorNotification(error);
 			} finally {
diff --git a/apps/ui/src/routes/services/[id]/__layout.svelte b/apps/ui/src/routes/services/[id]/__layout.svelte
index d6b004b20..b4c56ff6b 100644
--- a/apps/ui/src/routes/services/[id]/__layout.svelte
+++ b/apps/ui/src/routes/services/[id]/__layout.svelte
@@ -85,7 +85,7 @@
 				if (service.type && $status.service.isRunning)
 					await post(`/services/${service.id}/${service.type}/stop`, {});
 				await del(`/services/${service.id}`, { id: service.id });
-				return await goto(`/`, { replaceState: true });
+				return await window.location.assign(`/`);
 			} catch (error) {
 				return errorNotification(error);
 			} finally {

From 44dc3b743eaa3b555c78710cf0d0b704c7858a38 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 08:35:31 +0000
Subject: [PATCH 7/8] add debug

---
 apps/api/src/lib/common.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 55bfb08ab..3df3ab560 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -1185,6 +1185,8 @@ export async function getFreeExposedPort(id, exposePort, engine, remoteEngine, r
 			})
 		).map((a) => a.exposePort);
 		const usedPorts = [...applicationUsed, ...serviceUsed];
+		console.log(usedPorts)
+		console.log(exposePort)
 		if (usedPorts.includes(exposePort)) {
 			return false
 		}

From d3af6792d0feaccc1aac41ebba677cb8a77b75ce Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Sat, 10 Sep 2022 08:46:31 +0000
Subject: [PATCH 8/8] remove debug

---
 apps/api/src/lib/common.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 3df3ab560..55bfb08ab 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -1185,8 +1185,6 @@ export async function getFreeExposedPort(id, exposePort, engine, remoteEngine, r
 			})
 		).map((a) => a.exposePort);
 		const usedPorts = [...applicationUsed, ...serviceUsed];
-		console.log(usedPorts)
-		console.log(exposePort)
 		if (usedPorts.includes(exposePort)) {
 			return false
 		}