feat: custom docker compose file location in repo

apps/api/src/jobs/deployApplication.ts

@@ -78,6 +78,7 @@ import * as buildpacks from '../lib/buildPacks';
 								baseDirectory,
 								publishDirectory,
 								dockerFileLocation,
+								dockerComposeFileLocation,
 								dockerComposeConfiguration,
 								denoMainFile
 							} = application
@@ -158,6 +159,7 @@ import * as buildpacks from '../lib/buildPacks';
 									publishDirectory = configuration.publishDirectory;
 									baseDirectory = configuration.baseDirectory || '';
 									dockerFileLocation = configuration.dockerFileLocation;
+									dockerComposeFileLocation = configuration.dockerComposeFileLocation;
 									denoMainFile = configuration.denoMainFile;
 									const commit = await importers[gitSource.type]({
 										applicationId,
@@ -266,6 +268,7 @@ import * as buildpacks from '../lib/buildPacks';
 												pythonVariable,
 												dockerFileLocation,
 												dockerComposeConfiguration,
+												dockerComposeFileLocation,
 												denoMainFile,
 												denoOptions,
 												baseImage,

apps/api/src/lib/buildPacks/common.ts

@@ -363,6 +363,7 @@ export const setDefaultConfiguration = async (data: any) => {
 		publishDirectory,
 		baseDirectory,
 		dockerFileLocation,
+		dockerComposeFileLocation,
 		denoMainFile
 	} = data;
 	//@ts-ignore
@@ -392,6 +393,12 @@ export const setDefaultConfiguration = async (data: any) => {
 	} else {
 		dockerFileLocation = '/Dockerfile';
 	}
+	if (dockerComposeFileLocation) {
+		if (!dockerComposeFileLocation.startsWith('/')) dockerComposeFileLocation = `/${dockerComposeFileLocation}`;
+		if (dockerComposeFileLocation.endsWith('/')) dockerComposeFileLocation = dockerComposeFileLocation.slice(0, -1);
+	} else {
+		dockerComposeFileLocation = '/Dockerfile';
+	}
 	if (!denoMainFile) {
 		denoMainFile = 'main.ts';
 	}
@@ -405,6 +412,7 @@ export const setDefaultConfiguration = async (data: any) => {
 		publishDirectory,
 		baseDirectory,
 		dockerFileLocation,
+		dockerComposeFileLocation,
 		denoMainFile
 	};
 };

apps/api/src/lib/buildPacks/compose.ts

@@ -17,23 +17,11 @@ export default async function (data) {
         secrets,
         pullmergeRequestId,
         port,
-        dockerComposeConfiguration
+        dockerComposeConfiguration,
+        dockerComposeFileLocation
     } = data
-    const fileYml = `${workdir}${baseDirectory}/docker-compose.yml`;
-    const fileYaml = `${workdir}${baseDirectory}/docker-compose.yaml`;
-    let dockerComposeRaw = null;
-    let isYml = false;
-    try {
-        dockerComposeRaw = await fs.readFile(`${fileYml}`, 'utf8')
-        isYml = true
-    } catch (error) { }
-    try {
-        dockerComposeRaw = await fs.readFile(`${fileYaml}`, 'utf8')
-    } catch (error) { }
-
-    if (!dockerComposeRaw) {
-        throw ('docker-compose.yml or docker-compose.yaml are not found!');
-    }
+    const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`
+    const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8');
     const dockerComposeYaml = yaml.load(dockerComposeRaw)
     if (!dockerComposeYaml.services) {
         throw 'No Services found in docker-compose file.'
@@ -119,7 +107,7 @@ export default async function (data) {
         dockerComposeYaml['volumes'] = { ...composeVolumes }
     }
     dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } })
-    await fs.writeFile(`${workdir}/docker-compose.${isYml ? 'yml' : 'yaml'}`, yaml.dump(dockerComposeYaml));
+    await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml));
     await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} pull` })
     await saveBuildLog({ line: 'Pulling images from Compose file.', buildId, applicationId });
     await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker compose --project-directory ${workdir} build --progress plain` })

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -351,6 +351,7 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
             publishDirectory,
             baseDirectory,
             dockerFileLocation,
+            dockerComposeFileLocation,
             denoMainFile
         });
         if (baseDatabaseBranch) {
@@ -820,7 +821,7 @@ export async function saveRepository(request, reply) {
         let { repository, branch, projectId, autodeploy, webhookToken, isPublicRepository = false } = request.body
 
         repository = repository.toLowerCase();
-        
+
         projectId = Number(projectId);
         if (webhookToken) {
             await prisma.application.update({