Merge pull request #1502 from Dokploy/1493-railpack-spawns-multiple-build-kit-containers

1493 railpack spawns multiple build kit containers

packages/server/src/services/docker.ts

@@ -136,8 +136,7 @@ export const getContainersByAppNameMatch = async (
 			result = stdout.trim().split("\n");
 		}
 
-		const containers = result
+		const containers = result.map((line) => {
-			.map((line) => {
 			const parts = line.split(" | ");
 			const containerId = parts[0]
 				? parts[0].replace("CONTAINER ID : ", "").trim()
@@ -154,8 +153,7 @@ export const getContainersByAppNameMatch = async (
 				name,
 				state,
 			};
-			})
+		});
-			.sort((a, b) => a.name.localeCompare(b.name));
 
 		return containers || [];
 	} catch (_error) {}
@@ -192,8 +190,7 @@ export const getStackContainersByAppName = async (
 			result = stdout.trim().split("\n");
 		}
 
-		const containers = result
+		const containers = result.map((line) => {
-			.map((line) => {
 			const parts = line.split(" | ");
 			const containerId = parts[0]
 				? parts[0].replace("CONTAINER ID : ", "").trim()
@@ -214,8 +211,7 @@ export const getStackContainersByAppName = async (
 				state,
 				node,
 			};
-			})
+		});
-			.sort((a, b) => a.name.localeCompare(b.name));
 
 		return containers || [];
 	} catch (_error) {}
@@ -253,8 +249,7 @@ export const getServiceContainersByAppName = async (
 			result = stdout.trim().split("\n");
 		}
 
-		const containers = result
+		const containers = result.map((line) => {
-			.map((line) => {
 			const parts = line.split(" | ");
 			const containerId = parts[0]
 				? parts[0].replace("CONTAINER ID : ", "").trim()
@@ -276,8 +271,7 @@ export const getServiceContainersByAppName = async (
 				state,
 				node,
 			};
-			})
+		});
-			.sort((a, b) => a.name.localeCompare(b.name));
 
 		return containers || [];
 	} catch (_error) {}
@@ -318,8 +312,7 @@ export const getContainersByAppLabel = async (
 
 		const lines = stdout.trim().split("\n");
 
-		const containers = lines
+		const containers = lines.map((line) => {
-			.map((line) => {
 			const parts = line.split(" | ");
 			const containerId = parts[0]
 				? parts[0].replace("CONTAINER ID : ", "").trim()
@@ -335,8 +328,7 @@ export const getContainersByAppLabel = async (
 				name,
 				state,
 			};
-			})
+		});
-			.sort((a, b) => a.name.localeCompare(b.name));
 
 		return containers || [];
 	} catch (_error) {}

packages/server/src/utils/builders/railpack.ts

@@ -3,7 +3,6 @@ import type { ApplicationNested } from ".";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
 import { spawnAsync } from "../process/spawnAsync";
-import { execAsync } from "../process/execAsync";
 
 export const buildRailpack = async (
 	application: ApplicationNested,
@@ -17,32 +16,62 @@ export const buildRailpack = async (
 	);
 
 	try {
-		// Ensure buildkit container is running, create if it doesn't exist
+		// First prepare the build plan and info
-		await execAsync(
+		const prepareArgs = [
-			"docker container inspect buildkit >/dev/null 2>&1 || docker run --rm --privileged -d --name buildkit moby/buildkit",
+			"prepare",
-		);
+			buildAppDirectory,
+			"--plan-out",
+			`${buildAppDirectory}/railpack-plan.json`,
+			"--info-out",
+			`${buildAppDirectory}/railpack-info.json`,
+		];
 
-		// Build the application using railpack
+		// Add environment variables to prepare command
-		const args = ["build", buildAppDirectory, "--name", appName];
-
-		// Add environment variables
 		for (const env of envVariables) {
-			args.push("--env", env);
+			prepareArgs.push("--env", env);
 		}
 
+		// Run prepare command
+		await spawnAsync("railpack", prepareArgs, (data) => {
+			if (writeStream.writable) {
+				writeStream.write(data);
+			}
+		});
+
+		// Build with BuildKit using the Railpack frontend
+		const buildArgs = [
+			"buildx",
+			"build",
+			"--build-arg",
+			"BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.55",
+			"-f",
+			`${buildAppDirectory}/railpack-plan.json`,
+			"--output",
+			`type=docker,name=${appName}`,
+		];
+
+		// Add secrets properly formatted
+		const env: { [key: string]: string } = {};
+		for (const envVar of envVariables) {
+			const [key, value] = envVar.split("=");
+			if (key && value) {
+				buildArgs.push("--secret", `id=${key},env=${key}`);
+				env[key] = value;
+			}
+		}
+
+		buildArgs.push(buildAppDirectory);
+
 		await spawnAsync(
-			"railpack",
+			"docker",
-			args,
+			buildArgs,
 			(data) => {
 				if (writeStream.writable) {
 					writeStream.write(data);
 				}
 			},
 			{
-				env: {
+				env: { ...process.env, ...env },
-					...process.env,
-					BUILDKIT_HOST: "docker-container://buildkit",
-				},
 			},
 		);
 
@@ -63,25 +92,65 @@ export const getRailpackCommand = (
 		application.project.env,
 	);
 
-	// Build the application using railpack
+	// Prepare command
-	const args = ["build", buildAppDirectory, "--name", appName];
+	const prepareArgs = [
+		"prepare",
+		buildAppDirectory,
+		"--plan-out",
+		`${buildAppDirectory}/railpack-plan.json`,
+		"--info-out",
+		`${buildAppDirectory}/railpack-info.json`,
+	];
 
-	// Add environment variables
 	for (const env of envVariables) {
-		args.push("--env", env);
+		prepareArgs.push("--env", env);
 	}
 
-	const command = `railpack ${args.join(" ")}`;
+	// Build command
+	const buildArgs = [
+		"buildx",
+		"build",
+		"--build-arg",
+		"BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.55",
+		"-f",
+		`${buildAppDirectory}/railpack-plan.json`,
+		"--output",
+		`type=docker,name=${appName}`,
+	];
+
+	// Add secrets properly formatted
+	const exportEnvs = [];
+	for (const envVar of envVariables) {
+		const [key, value] = envVar.split("=");
+		if (key && value) {
+			buildArgs.push("--secret", `id=${key},env=${key}`);
+			exportEnvs.push(`export ${key}=${value}`);
+		}
+	}
+
+	buildArgs.push(buildAppDirectory);
+
 	const bashCommand = `
-	echo "Building with Railpack..." >> "${logPath}";
+# Ensure we have a builder with containerd
-	docker container inspect buildkit >/dev/null 2>&1 || docker run --rm --privileged -d --name buildkit moby/buildkit;
+docker buildx create --use --name builder-containerd --driver docker-container || true
-	export BUILDKIT_HOST=docker-container://buildkit;
+docker buildx use builder-containerd
-	${command} >> ${logPath} 2>> ${logPath} || { 
+
+echo "Preparing Railpack build plan..." >> "${logPath}";
+railpack ${prepareArgs.join(" ")} >> ${logPath} 2>> ${logPath} || { 
+	echo "❌ Railpack prepare failed" >> ${logPath};
+	exit 1;
+}
+echo "✅ Railpack prepare completed." >> ${logPath};
+
+echo "Building with Railpack frontend..." >> "${logPath}";
+# Export environment variables for secrets
+${exportEnvs.join("\n")}
+docker ${buildArgs.join(" ")} >> ${logPath} 2>> ${logPath} || { 
 	echo "❌ Railpack build failed" >> ${logPath};
 	exit 1;
-	  }
+}
-	echo "✅ Railpack build completed." >> ${logPath};
+echo "✅ Railpack build completed." >> ${logPath};
-	`;
+`;
 
 	return bashCommand;
 };