From 06cbd1fce1a96692917e7c6b88b87155174e77d7 Mon Sep 17 00:00:00 2001
From: xenonwellz <59710311+xenonwellz@users.noreply.github.com>
Date: Sun, 3 Nov 2024 15:26:54 +0100
Subject: [PATCH] refactor(bundler): removed redundant code

---
 packages/server/src/utils/builders/compose.ts | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts
index dd48e0c2..514d7bd8 100644
--- a/packages/server/src/utils/builders/compose.ts
+++ b/packages/server/src/utils/builders/compose.ts
@@ -148,8 +148,17 @@ const sanitizeCommand = (command: string) => {
 export const createCommand = (compose: ComposeNested) => {
 	const { composeType, appName, sourceType } = compose;
 
-	const path =
-		sourceType === "raw" ? "docker-compose.processed.yml" : compose.composePath;
+	let path = "";
+
+	if (sourceType !== "raw") {
+		path = compose.composePath;
+	} else {
+		path =
+			composeType === "stack"
+				? "docker-compose.processed.yml"
+				: "docker-compose.yml";
+	}
+
 	let command = "";
 
 	if (composeType === "docker-compose") {
@@ -196,13 +205,9 @@ export const processComposeFile = async (compose: ComposeNested) => {
 	const { COMPOSE_PATH } = paths();
 	const command = getProcessComposeFileCommand(compose);
 
-	if (compose.serverId) {
-		await execAsyncRemote(compose.serverId, command);
-	} else {
-		await execAsync(command, {
-			cwd: join(COMPOSE_PATH, compose.appName, "code"),
-		});
-	}
+	await execAsync(command, {
+		cwd: join(COMPOSE_PATH, compose.appName, "code"),
+	});
 };
 
 export const getProcessComposeFileCommand = (compose: ComposeNested) => {
@@ -214,10 +219,6 @@ export const getProcessComposeFileCommand = (compose: ComposeNested) => {
 		command = `export $(grep -v '^#' .env | xargs) && docker stack config -c docker-compose.yml > docker-compose.processed.yml`;
 	}
 
-	if (composeType === "docker-compose") {
-		command = "cp docker-compose.yml docker-compose.processed.yml";
-	}
-
 	return command;
 };