feat: Multiply dockerfile locations for docker buildpack

prisma/migrations/20220419203408_multiply_dockerfile_locations/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "dockerFileLocation" TEXT;

prisma/schema.prisma

@@ -91,6 +91,7 @@ model Application {
   pythonWSGI          String?
   pythonModule        String?
   pythonVariable      String?
+  dockerFileLocation  String?                         
   createdAt           DateTime                       @default(now())
   updatedAt           DateTime                       @updatedAt
   settings            ApplicationSettings?

src/lib/buildPacks/common.ts

@@ -91,7 +91,8 @@ export const setDefaultConfiguration = async (data) => {
 		startCommand,
 		buildCommand,
 		publishDirectory,
-		baseDirectory
+		baseDirectory,
+		dockerFileLocation
 	} = data;
 	const template = scanningTemplates[buildPack];
 	if (!port) {
@@ -110,6 +111,12 @@ export const setDefaultConfiguration = async (data) => {
 		if (!baseDirectory.startsWith('/')) baseDirectory = `/${baseDirectory}`;
 		if (!baseDirectory.endsWith('/')) baseDirectory = `${baseDirectory}/`;
 	}
+	if (dockerFileLocation) {
+		if (!dockerFileLocation.startsWith('/')) dockerFileLocation = `/${dockerFileLocation}`;
+		if (dockerFileLocation.endsWith('/')) dockerFileLocation = dockerFileLocation.slice(0, -1);
+	} else {
+		dockerFileLocation = '/Dockerfile';
+	}
 
 	return {
 		buildPack,
@@ -118,7 +125,8 @@ export const setDefaultConfiguration = async (data) => {
 		startCommand,
 		buildCommand,
 		publishDirectory,
-		baseDirectory
+		baseDirectory,
+		dockerFileLocation
 	};
 };
 

src/lib/buildPacks/docker.ts

@@ -10,15 +10,16 @@ export default async function ({
 	buildId,
 	baseDirectory,
 	secrets,
-	pullmergeRequestId
+	pullmergeRequestId,
+	dockerFileLocation
 }) {
 	try {
-		let file = `${workdir}/Dockerfile`;
+		const file = `${workdir}${dockerFileLocation}`;
+		let dockerFileOut = `${workdir}`;
 		if (baseDirectory) {
-			file = `${workdir}/${baseDirectory}/Dockerfile`;
+			dockerFileOut = `${workdir}${baseDirectory}`;
-			workdir = `${workdir}/${baseDirectory}`;
+			workdir = `${workdir}${baseDirectory}`;
 		}
-
 		const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8'))
 			.toString()
 			.trim()
@@ -41,8 +42,8 @@ export default async function ({
 				}
 			});
 		}
-		await fs.writeFile(`${file}`, Dockerfile.join('\n'));
+		await fs.writeFile(`${dockerFileOut}${dockerFileLocation}`, Dockerfile.join('\n'));
-		await buildImage({ applicationId, tag, workdir, docker, buildId, debug });
+		await buildImage({ applicationId, tag, workdir, docker, buildId, debug, dockerFileLocation });
 	} catch (error) {
 		throw error;
 	}

src/lib/database/applications.ts

@@ -263,7 +263,8 @@ export async function configureApplication({
 	publishDirectory,
 	pythonWSGI,
 	pythonModule,
-	pythonVariable
+	pythonVariable,
+	dockerFileLocation
 }: {
 	id: string;
 	buildPack: string;
@@ -278,6 +279,7 @@ export async function configureApplication({
 	pythonWSGI: string;
 	pythonModule: string;
 	pythonVariable: string;
+	dockerFileLocation: string;
 }): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
@@ -293,7 +295,8 @@ export async function configureApplication({
 			publishDirectory,
 			pythonWSGI,
 			pythonModule,
-			pythonVariable
+			pythonVariable,
+			dockerFileLocation
 		}
 	});
 }

src/lib/docker.ts

@@ -85,7 +85,8 @@ export async function buildImage({
 	docker,
 	buildId,
 	isCache = false,
-	debug = false
+	debug = false,
+	dockerFileLocation = '/Dockerfile'
 }) {
 	if (isCache) {
 		await saveBuildLog({ line: `Building cache image started.`, buildId, applicationId });
@@ -103,7 +104,7 @@ export async function buildImage({
 	const stream = await docker.engine.buildImage(
 		{ src: ['.'], context: workdir },
 		{
-			dockerfile: isCache ? 'Dockerfile-cache' : 'Dockerfile',
+			dockerfile: isCache ? `${dockerFileLocation}-cache` : dockerFileLocation,
 			t: `${applicationId}:${tag}${isCache ? '-cache' : ''}`
 		}
 	);

src/lib/queues/builder.ts

@@ -56,7 +56,8 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 		buildCommand,
 		startCommand,
 		baseDirectory,
-		publishDirectory
+		publishDirectory,
+		dockerFileLocation
 	} = job.data;
 	const { debug } = settings;
 
@@ -107,6 +108,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 		buildCommand = configuration.buildCommand;
 		publishDirectory = configuration.publishDirectory;
 		baseDirectory = configuration.baseDirectory;
+		dockerFileLocation = configuration.dockerFileLocation;
 
 		const commit = await importers[gitSource.type]({
 			applicationId,
@@ -209,7 +211,8 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 					phpModules,
 					pythonWSGI,
 					pythonModule,
-					pythonVariable
+					pythonVariable,
+					dockerFileLocation
 				});
 			else {
 				await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });

src/lib/types/builderJob.ts

@@ -21,6 +21,7 @@ export type BuilderJob = {
 	pythonWSGI: string;
 	pythonModule: string;
 	pythonVariable: string;
+	dockerFileLocation: string;
 	createdAt: string;
 	updatedAt: string;
 	destinationDockerId: string;

src/routes/applications/[id]/index.json.ts

@@ -56,7 +56,8 @@ export const post: RequestHandler = async (event) => {
 		publishDirectory,
 		pythonWSGI,
 		pythonModule,
-		pythonVariable
+		pythonVariable,
+		dockerFileLocation
 	} = await event.request.json();
 	if (port) port = Number(port);
 
@@ -68,7 +69,8 @@ export const post: RequestHandler = async (event) => {
 			startCommand,
 			buildCommand,
 			publishDirectory,
-			baseDirectory
+			baseDirectory,
+			dockerFileLocation
 		});
 		await db.configureApplication({
 			id,
@@ -84,6 +86,7 @@ export const post: RequestHandler = async (event) => {
 			pythonWSGI,
 			pythonModule,
 			pythonVariable,
+			dockerFileLocation,
 			...defaultConfiguration
 		});
 		return { status: 201 };

src/routes/applications/[id]/index.svelte

@@ -68,11 +68,6 @@
 			value: 'Gunicorn',
 			label: 'Gunicorn'
 		}
-		// },
-		// {
-		// 	value: 'uWSGI',
-		// 	label: 'uWSGI'
-		// }
 	];
 
 	if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
@@ -420,6 +415,23 @@
 					/>
 				</div>
 			{/if}
+			{#if application.buildPack === 'docker'}
+				<div class="grid grid-cols-2 items-center">
+					<label for="dockerFileLocation" class="text-base font-bold text-stone-100"
+						>Dockerfile Location</label
+					>
+					<input
+						readonly={!$session.isAdmin}
+						name="dockerFileLocation"
+						id="dockerFileLocation"
+						bind:value={application.dockerFileLocation}
+						placeholder="default: /Dockerfile"
+					/>
+					<Explainer
+						text="Does not rely on Base Directory. <br>Should be absolute path, like <span class='text-green-500 font-bold'>/data/Dockerfile</span> or <span class='text-green-500 font-bold'>/Dockerfile.</span>"
+					/>
+				</div>
+			{/if}
 			<div class="grid grid-cols-2 items-center">
 				<div class="flex-col">
 					<label for="baseDirectory" class="pt-2 text-base font-bold text-stone-100"