refactor: enhance Railpack build process by introducing preparation step and environment variable handling

This commit is contained in:
Mauricio Siu
2025-03-15 17:11:20 -06:00
parent bbe7d5bdc5
commit 005f73d665

View File

@@ -3,7 +3,6 @@ import type { ApplicationNested } from ".";
import { prepareEnvironmentVariables } from "../docker/utils"; import { prepareEnvironmentVariables } from "../docker/utils";
import { getBuildAppDirectory } from "../filesystem/directory"; import { getBuildAppDirectory } from "../filesystem/directory";
import { spawnAsync } from "../process/spawnAsync"; import { spawnAsync } from "../process/spawnAsync";
import { execAsync } from "../process/execAsync";
export const buildRailpack = async ( export const buildRailpack = async (
application: ApplicationNested, application: ApplicationNested,
@@ -17,32 +16,62 @@ export const buildRailpack = async (
); );
try { 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) { 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( await spawnAsync(
"railpack", "docker",
args, buildArgs,
(data) => { (data) => {
if (writeStream.writable) { if (writeStream.writable) {
writeStream.write(data); writeStream.write(data);
} }
}, },
{ {
env: { env: { ...process.env, ...env },
...process.env,
BUILDKIT_HOST: "docker-container://buildkit",
},
}, },
); );
@@ -63,25 +92,62 @@ export const getRailpackCommand = (
application.project.env, 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) { 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 = ` const bashCommand = `
echo "Building with Railpack..." >> "${logPath}"; echo "Preparing Railpack build plan..." >> "${logPath}";
docker container inspect buildkit >/dev/null 2>&1 || docker run --rm --privileged -d --name buildkit moby/buildkit; railpack ${prepareArgs.join(" ")} >> ${logPath} 2>> ${logPath} || {
export BUILDKIT_HOST=docker-container://buildkit; echo "❌ Railpack prepare failed" >> ${logPath};
${command} >> ${logPath} 2>> ${logPath} || { exit 1;
echo "❌ Railpack build failed" >> ${logPath}; }
exit 1; echo "✅ Railpack prepare completed." >> ${logPath};
}
echo "✅ Railpack build 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};
`;
return bashCommand; return bashCommand;
}; };
// docker buildx build --build-arg BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.55 -f /Users/mauricio/Documents/Github/Personal/dokploy/apps/dokploy/.docker/applications/dsfgsdfg-sdfgdsfg-fyk3r9/code/astro/railpack-plan.json /Users/mauricio/Documents/Github/Personal/dokploy/apps/dokploy/.docker/applications/dsfgsdfg-sdfgdsfg-fyk3r9/code/astro