From d641d32413d713be538c55f5fa95137bac95d9ba Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Jan 2023 09:48:15 +0100
Subject: [PATCH] fix: compose file location

---
 apps/api/src/jobs/deployApplication.ts              | 4 ++--
 apps/api/src/routes/api/v1/applications/handlers.ts | 4 ++--
 apps/server/src/jobs/applicationBuildQueue.ts       | 4 ++--
 apps/server/src/trpc/routers/applications/index.ts  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts
index f5809c684..ee698309f 100644
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -196,7 +196,7 @@ import * as buildpacks from '../lib/buildPacks';
 											await executeCommand({
 												debug: true,
 												dockerId: destinationDocker.id,
-												command: `docker compose --project-directory ${workdir} up -d`
+												command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
 										} catch (error) {
@@ -726,7 +726,7 @@ import * as buildpacks from '../lib/buildPacks';
 											await executeCommand({
 												debug,
 												dockerId: destinationDocker.id,
-												command: `docker compose --project-directory ${workdir} up -d`
+												command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
 										} catch (error) {
diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts
index fb27f2701..66186a178 100644
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -670,7 +670,7 @@ export async function restartApplication(
 
 			await executeCommand({
 				dockerId,
-				command: `docker compose --project-directory ${workdir} up -d`
+				command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 			});
 			return reply.code(201).send();
 		}
@@ -1451,7 +1451,7 @@ export async function restartPreview(
 			await executeCommand({ dockerId, command: `docker rm ${id}-${pullmergeRequestId}` });
 			await executeCommand({
 				dockerId,
-				command: `docker compose --project-directory ${workdir} up -d`
+				command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 			});
 			return reply.code(201).send();
 		}
diff --git a/apps/server/src/jobs/applicationBuildQueue.ts b/apps/server/src/jobs/applicationBuildQueue.ts
index ff94f01db..0242d2a11 100644
--- a/apps/server/src/jobs/applicationBuildQueue.ts
+++ b/apps/server/src/jobs/applicationBuildQueue.ts
@@ -195,7 +195,7 @@ import { defaultComposeConfiguration } from '../lib/docker';
 											await executeCommand({
 												debug: true,
 												dockerId: destinationDocker.id,
-												command: `docker compose --project-directory ${workdir} up -d`
+												command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
 										} catch (error) {
@@ -765,7 +765,7 @@ import { defaultComposeConfiguration } from '../lib/docker';
 											await executeCommand({
 												debug,
 												dockerId: destinationDocker.id,
-												command: `docker compose --project-directory ${workdir} up -d`
+												command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
 										} catch (error) {
diff --git a/apps/server/src/trpc/routers/applications/index.ts b/apps/server/src/trpc/routers/applications/index.ts
index 939fceefe..12956b610 100644
--- a/apps/server/src/trpc/routers/applications/index.ts
+++ b/apps/server/src/trpc/routers/applications/index.ts
@@ -177,7 +177,7 @@ export const applicationsRouter = router({
 				await executeCommand({ dockerId, command: `docker rm ${id}-${pullmergeRequestId}` });
 				await executeCommand({
 					dockerId,
-					command: `docker compose --project-directory ${workdir} up -d`
+					command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 				});
 			}
 		}),
@@ -1311,7 +1311,7 @@ export const applicationsRouter = router({
 
 				await executeCommand({
 					dockerId,
-					command: `docker compose --project-directory ${workdir} up -d`
+					command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
 				});
 			}
 			return {};