WIP: Base image selector

src/lib/database/applications.ts

@@ -12,6 +12,17 @@ import type {
 	Application,
 	ApplicationPersistentStorage
 } from '@prisma/client';
+const nodeBased = [
+	'react',
+	'vuejs',
+	'static',
+	'svelte',
+	'gatsby',
+	'php',
+	'astro',
+	'eleventy',
+	'node'
+];
 
 export async function listApplications(teamId: string): Promise<Application[]> {
 	if (teamId === '0') {
@@ -195,6 +206,24 @@ export async function getApplication({ id, teamId }: { id: string; teamId: strin
 			return s;
 		});
 	}
+	// Set default build images
+	if (!body.baseImage) {
+		if (nodeBased.includes(body.buildPack)) {
+			body.baseImage = 'node:lts';
+		}
+		if (body.buildPack === 'python') {
+			body.baseImage = 'python:3-alpine';
+		}
+		if (body.buildPack === 'rust') {
+			body.baseImage = 'rust:latest';
+		}
+		if (body.buildPack === 'deno') {
+			body.baseImage = 'denoland/deno:latest';
+		}
+		if (body.buildPack === 'php') {
+			body.baseImage = 'webdevops/php-apache:8.0-alpine';
+		}
+	}
 
 	return { ...body };
 }
@@ -266,7 +295,8 @@ export async function configureApplication({
 	pythonVariable,
 	dockerFileLocation,
 	denoMainFile,
-	denoOptions
+	denoOptions,
+	baseImage
 }: {
 	id: string;
 	buildPack: string;
@@ -284,6 +314,7 @@ export async function configureApplication({
 	dockerFileLocation: string;
 	denoMainFile: string;
 	denoOptions: string;
+	baseImage: string;
 }): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
@@ -302,7 +333,8 @@ export async function configureApplication({
 			pythonVariable,
 			dockerFileLocation,
 			denoMainFile,
-			denoOptions
+			denoOptions,
+			baseImage
 		}
 	});
 }

src/lib/docker.ts

@@ -41,10 +41,11 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
 		Dockerfile.push('RUN pnpm add -g pnpm');
 	}
-	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	if (installCommand) {
+		Dockerfile.push(`COPY .${baseDirectory || ''}/package.json ./`);
 		Dockerfile.push(`RUN ${installCommand}`);
 	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${buildCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ applicationId, tag, workdir, docker, buildId, isCache: true, debug });

src/lib/locales/en.json

@@ -124,7 +124,7 @@
 			"no_branches_found": "No branches found",
 			"configure_build_pack": "Configure Build Pack",
 			"scanning_repository_suggest_build_pack": "Scanning repository to suggest a build pack for you...",
-			"found_lock_file": "Found lock file for <span class=\"font-bold text-orange-500 pl-1\">{{packageManager}}</span>. Using it for predefined commands commands.",
+			"found_lock_file": "Found lock file for  <span class=\"font-bold text-orange-500 px-1\"> {{packageManager}}</span>.Using it for predefined commands commands.",
 			"configure_destination": "Configure Destination",
 			"no_configurable_destination": "No configurable Destination found",
 			"select_a_repository_project": "Select a Repository / Project",
@@ -184,6 +184,7 @@
 		"git_source": "Git Source",
 		"git_repository": "Git Repository",
 		"build_pack": "Build Pack",
+		"base_image": "Base Image",
 		"destination": "Destination",
 		"application": "Application",
 		"url_fqdn": "URL (FQDN)",