Refactor compose and deployment services: streamline cloning and execution commands, remove redundant remote functions, and enhance error handling. Update database schema to include application build server ID for better tracking of deployments.

2026-07-26 08:15:25 +02:00 · 2025-11-09 03:12:49 -06:00
parent fd8f0e8f1f
commit 7b398939f7
24 changed files with 386 additions and 1841 deletions
--- a/packages/server/src/utils/builders/compose.ts
+++ b/packages/server/src/utils/builders/compose.ts
@@ -17,7 +17,7 @@ import {
 	getEnviromentVariablesObject,
 	prepareEnvironmentVariables,
 } from "../docker/utils";
-import { execAsync, execAsyncRemote } from "../process/execAsync";
+import { execAsync } from "../process/execAsync";
 import { spawnAsync } from "../process/spawnAsync";

 export type ComposeNested = InferResultType<
@@ -96,22 +96,15 @@ export const buildCompose = async (compose: ComposeNested, logPath: string) => {
 	}
 };

-export const getBuildComposeCommand = async (
-	compose: ComposeNested,
-	logPath: string,
-) => {
-	const { COMPOSE_PATH } = paths(true);
+export const getBuildComposeCommand = async (compose: ComposeNested) => {
+	const { COMPOSE_PATH } = paths(!!compose.serverId);
 	const { sourceType, appName, mounts, composeType, domains } = compose;
 	const command = createCommand(compose);
 	const envCommand = getCreateEnvFileCommand(compose);
 	const projectPath = join(COMPOSE_PATH, compose.appName, "code");
 	const exportEnvCommand = getExportEnvCommand(compose);

-	const newCompose = await writeDomainsToComposeRemote(
-		compose,
-		domains,
-		logPath,
-	);
+	const newCompose = await writeDomainsToComposeRemote(compose, domains);
 	const logContent = `
 App Name: ${appName}
 Build Compose 🐳
@@ -133,7 +126,7 @@ Compose Type: ${composeType} ✅`;
 	const bashCommand = `
 	set -e
 	{
-		echo "${logBox}" >> "${logPath}"
+		echo "${logBox}";
 	
 		${newCompose}
 	
@@ -143,17 +136,18 @@ Compose Type: ${composeType} ✅`;

        ${exportEnvCommand}
 		${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""}
-		docker ${command.split(" ").join(" ")} >> "${logPath}" 2>&1 || { echo "Error: ❌ Docker command failed" >> "${logPath}"; exit 1; }
+		docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; }
 		${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""}
 	
-		echo "Docker Compose Deployed: ✅" >> "${logPath}"
+		echo "Docker Compose Deployed: ✅";
 	} || {
-		echo "Error: ❌ Script execution failed" >> "${logPath}"
+		echo "Error: ❌ Script execution failed";
 		exit 1
 	}
 	`;

-	return await execAsyncRemote(compose.serverId, bashCommand);
+	return bashCommand;
+	// return await execAsyncRemote(compose.serverId, bashCommand);
 };

 const sanitizeCommand = (command: string) => {
@@ -216,7 +210,7 @@ const createEnvFile = (compose: ComposeNested) => {
 };

 export const getCreateEnvFileCommand = (compose: ComposeNested) => {
-	const { COMPOSE_PATH } = paths(true);
+	const { COMPOSE_PATH } = paths(!!compose.serverId);
 	const { env, composePath, appName } = compose;
 	const composeFilePath =
 		join(COMPOSE_PATH, appName, "code", composePath) ||
--- a/packages/server/src/utils/builders/docker-file.ts
+++ b/packages/server/src/utils/builders/docker-file.ts
@@ -100,10 +100,7 @@ export const buildCustomDocker = async (
 	}
 };

-export const getDockerCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getDockerCommand = (application: ApplicationNested) => {
 	const {
 		appName,
 		env,
@@ -176,17 +173,17 @@ export const getDockerCommand = (
 		}

 		command += `
-echo "Building ${appName}" >> ${logPath};
-cd ${dockerContextPath} >> ${logPath} 2>> ${logPath} || { 
-  echo "❌ The path ${dockerContextPath} does not exist" >> ${logPath};
+echo "Building ${appName}" ;
+cd ${dockerContextPath} || { 
+  echo "❌ The path ${dockerContextPath} does not exist" ;
  exit 1;
 }

-${joinedSecrets} docker ${commandArgs.join(" ")} >> ${logPath} 2>> ${logPath} || { 
-  echo "❌ Docker build failed" >> ${logPath};
+${joinedSecrets} docker ${commandArgs.join(" ")} || { 
+  echo "❌ Docker build failed" ;
  exit 1;
 }
-echo "✅ Docker build completed." >> ${logPath};
+echo "✅ Docker build completed." ;
 		`;

 		return command;
--- a/packages/server/src/utils/builders/heroku.ts
+++ b/packages/server/src/utils/builders/heroku.ts
@@ -45,10 +45,7 @@ export const buildHeroku = async (
 	}
 };

-export const getHerokuCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getHerokuCommand = (application: ApplicationNested) => {
 	const { env, appName, cleanCache } = application;

 	const buildAppDirectory = getBuildAppDirectory(application);
@@ -77,12 +74,12 @@ export const getHerokuCommand = (

 	const command = `pack ${args.join(" ")}`;
 	const bashCommand = `
-echo "Starting heroku build..." >> ${logPath};
-${command} >> ${logPath} 2>> ${logPath} || { 
-  echo "❌ Heroku build failed" >> ${logPath};
+echo "Starting heroku build..." ;
+${command} || { 
+  echo "❌ Heroku build failed" ;
  exit 1;
 }
-echo "✅ Heroku build completed." >> ${logPath};
+echo "✅ Heroku build completed." ;
 		`;

 	return bashCommand;
--- a/packages/server/src/utils/builders/index.ts
+++ b/packages/server/src/utils/builders/index.ts
@@ -76,34 +76,31 @@ export const buildApplication = async (
 	}
 };

-export const getBuildCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getBuildCommand = (application: ApplicationNested) => {
 	let command = "";
 	const { buildType, registry } = application;
 	switch (buildType) {
 		case "nixpacks":
-			command = getNixpacksCommand(application, logPath);
+			command = getNixpacksCommand(application);
 			break;
 		case "heroku_buildpacks":
-			command = getHerokuCommand(application, logPath);
+			command = getHerokuCommand(application);
 			break;
 		case "paketo_buildpacks":
-			command = getPaketoCommand(application, logPath);
+			command = getPaketoCommand(application);
 			break;
 		case "static":
-			command = getStaticCommand(application, logPath);
+			command = getStaticCommand(application);
 			break;
 		case "dockerfile":
-			command = getDockerCommand(application, logPath);
+			command = getDockerCommand(application);
 			break;
 		case "railpack":
-			command = getRailpackCommand(application, logPath);
+			command = getRailpackCommand(application);
 			break;
 	}
 	if (registry) {
-		command += uploadImageRemoteCommand(application, logPath);
+		command += uploadImageRemoteCommand(application);
 	}

 	return command;
--- a/packages/server/src/utils/builders/nixpacks.ts
+++ b/packages/server/src/utils/builders/nixpacks.ts
@@ -92,10 +92,7 @@ export const buildNixpacks = async (
 	}
 };

-export const getNixpacksCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getNixpacksCommand = (application: ApplicationNested) => {
 	const { env, appName, publishDirectory, cleanCache } = application;

 	const buildAppDirectory = getBuildAppDirectory(application);
@@ -121,13 +118,13 @@ export const getNixpacksCommand = (
 		args.push("--no-error-without-start");
 	}
 	const command = `nixpacks ${args.join(" ")}`;
-	let bashCommand = `
-echo "Starting nixpacks build..." >> ${logPath};
-${command} >> ${logPath} 2>> ${logPath} || { 
-  echo "❌ Nixpacks build failed" >> ${logPath};
-  exit 1;
-}
-echo "✅ Nixpacks build completed." >> ${logPath};
+	const bashCommand = `
+		echo "Starting nixpacks build..." ;
+		${command} || {
+			echo "❌ Nixpacks build failed" ;
+			exit 1;
+		}
+		echo "✅ Nixpacks build completed." ;
 		`;

 	/*
@@ -135,23 +132,23 @@ echo "✅ Nixpacks build completed." >> ${logPath};
 		and copy the artifacts on the host filesystem.
 		Then, remove the container and create a static build.
 	 */
-	if (publishDirectory) {
-		const localPath = path.join(buildAppDirectory, publishDirectory);
-		const isDirectory =
-			publishDirectory.endsWith("/") || !path.extname(publishDirectory);
+	// 	if (publishDirectory) {
+	// 		const localPath = path.join(buildAppDirectory, publishDirectory);
+	// 		const isDirectory =
+	// 			publishDirectory.endsWith("/") || !path.extname(publishDirectory);

-		bashCommand += `
-docker create --name ${buildContainerId} ${appName}
-mkdir -p ${localPath}
-docker cp ${buildContainerId}:/app/${publishDirectory}${isDirectory ? "/." : ""} ${path.join(buildAppDirectory, publishDirectory)} >> ${logPath} 2>> ${logPath} || { 
-	docker rm ${buildContainerId}
-	echo "❌ Copying ${publishDirectory} to ${path.join(buildAppDirectory, publishDirectory)} failed" >> ${logPath};
-	exit 1;
-}
-docker rm ${buildContainerId}
-${getStaticCommand(application, logPath)}
-			`;
-	}
+	// 		bashCommand += `
+	// docker create --name ${buildContainerId} ${appName}
+	// mkdir -p ${localPath}
+	// docker cp ${buildContainerId}:/app/${publishDirectory}${isDirectory ? "/." : ""} ${path.join(buildAppDirectory, publishDirectory)} || {
+	// 	docker rm ${buildContainerId}
+	// 	echo "❌ Copying ${publishDirectory} to ${path.join(buildAppDirectory, publishDirectory)} failed" ;
+	// 	exit 1;
+	// }
+	// docker rm ${buildContainerId}
+	// ${getStaticCommand(application)}
+	// 			`;
+	// 	}

 	return bashCommand;
 };
--- a/packages/server/src/utils/builders/paketo.ts
+++ b/packages/server/src/utils/builders/paketo.ts
@@ -44,10 +44,7 @@ export const buildPaketo = async (
 	}
 };

-export const getPaketoCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getPaketoCommand = (application: ApplicationNested) => {
 	const { env, appName, cleanCache } = application;

 	const buildAppDirectory = getBuildAppDirectory(application);
@@ -76,12 +73,12 @@ export const getPaketoCommand = (

 	const command = `pack ${args.join(" ")}`;
 	const bashCommand = `
-echo "Starting Paketo build..." >> ${logPath};
-${command} >> ${logPath} 2>> ${logPath} || { 
-  echo "❌ Paketo build failed" >> ${logPath};
+echo "Starting Paketo build..." ;
+${command} || { 
+  echo "❌ Paketo build failed" ;
  exit 1;
 }
-echo "✅ Paketo build completed." >> ${logPath};
+echo "✅ Paketo build completed." ;
 		`;

 	return bashCommand;
--- a/packages/server/src/utils/builders/railpack.ts
+++ b/packages/server/src/utils/builders/railpack.ts
@@ -116,10 +116,7 @@ export const buildRailpack = async (
 	}
 };

-export const getRailpackCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getRailpackCommand = (application: ApplicationNested) => {
 	const { env, appName, cleanCache } = application;
 	const buildAppDirectory = getBuildAppDirectory(application);
 	const envVariables = prepareEnvironmentVariables(
@@ -183,21 +180,21 @@ export const getRailpackCommand = (
 docker buildx create --use --name builder-containerd --driver docker-container || true
 docker buildx use builder-containerd

-echo "Preparing Railpack build plan..." >> "${logPath}";
-railpack ${prepareArgs.join(" ")} >> ${logPath} 2>> ${logPath} || { 
-	echo "❌ Railpack prepare failed" >> ${logPath};
+echo "Preparing Railpack build plan..." ;
+railpack ${prepareArgs.join(" ")} || { 
+	echo "❌ Railpack prepare failed" ;
 	exit 1;
 }
-echo "✅ Railpack prepare completed." >> ${logPath};
+echo "✅ Railpack prepare completed." ;

-echo "Building with Railpack frontend..." >> "${logPath}";
+echo "Building with Railpack frontend..." ;
 # Export environment variables for secrets
 ${exportEnvs.join("\n")}
-docker ${buildArgs.join(" ")} >> ${logPath} 2>> ${logPath} || { 
-	echo "❌ Railpack build failed" >> ${logPath};
+docker ${buildArgs.join(" ")} || { 
+	echo "❌ Railpack build failed" ;
 	exit 1;
 }
-echo "✅ Railpack build completed." >> ${logPath};
+echo "✅ Railpack build completed." ;
 docker buildx rm builder-containerd
 `;

--- a/packages/server/src/utils/builders/static.ts
+++ b/packages/server/src/utils/builders/static.ts
@@ -83,10 +83,7 @@ export const buildStatic = async (
 	}
 };

-export const getStaticCommand = (
-	application: ApplicationNested,
-	logPath: string,
-) => {
+export const getStaticCommand = (application: ApplicationNested) => {
 	const { publishDirectory } = application;
 	const buildAppDirectory = getBuildAppDirectory(application);

@@ -100,13 +97,10 @@ export const getStaticCommand = (
 		].join("\n"),
 	);

-	command += getDockerCommand(
-		{
-			...application,
-			buildType: "dockerfile",
-			dockerfile: "Dockerfile",
-		},
-		logPath,
-	);
+	command += getDockerCommand({
+		...application,
+		buildType: "dockerfile",
+		dockerfile: "Dockerfile",
+	});
 	return command;
 };