From b48b9765cd4aabf281734f032560eea4c05bfa3b Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:23:30 -0600
Subject: [PATCH 1/2] fix(nixpacks): adjust build path on nixpacks static

---
 .../dokploy/server/utils/builders/nixpacks.ts | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/apps/dokploy/server/utils/builders/nixpacks.ts b/apps/dokploy/server/utils/builders/nixpacks.ts
index 0f408743..4ae4b2cb 100644
--- a/apps/dokploy/server/utils/builders/nixpacks.ts
+++ b/apps/dokploy/server/utils/builders/nixpacks.ts
@@ -1,4 +1,4 @@
-import type { WriteStream } from "node:fs";
+import { mkdirSync, type WriteStream, existsSync } from "node:fs";
 import path from "node:path";
 import { buildStatic, getStaticCommand } from "@/server/utils/builders/static";
 import { nanoid } from "nanoid";
@@ -42,7 +42,6 @@ export const buildNixpacks = async (
 			and copy the artifacts on the host filesystem.
 			Then, remove the container and create a static build.
 		*/
-
 		if (publishDirectory) {
 			await spawnAsync(
 				"docker",
@@ -50,12 +49,22 @@ export const buildNixpacks = async (
 				writeToStream,
 			);
 
+			const localPath = path.join(buildAppDirectory, publishDirectory);
+
+			if (!existsSync(path.dirname(localPath))) {
+				mkdirSync(path.dirname(localPath), { recursive: true });
+			}
+
+			// https://docs.docker.com/reference/cli/docker/container/cp/
+			const isDirectory =
+				publishDirectory.endsWith("/") || !path.extname(publishDirectory);
+
 			await spawnAsync(
 				"docker",
 				[
 					"cp",
-					`${buildContainerId}:/app/${publishDirectory}`,
-					path.join(buildAppDirectory, publishDirectory),
+					`${buildContainerId}:/app/${publishDirectory}${isDirectory ? "/." : ""}`,
+					localPath,
 				],
 				writeToStream,
 			);
@@ -108,9 +117,14 @@ echo "✅ Nixpacks build completed." >> ${logPath};
 		Then, remove the container and create a static build.
 	 */
 	if (publishDirectory) {
+		const localPath = path.join(buildAppDirectory, publishDirectory);
+		const isDirectory =
+			publishDirectory.endsWith("/") || !path.extname(publishDirectory);
+
 		bashCommand += `
 docker create --name ${buildContainerId} ${appName}
-docker cp ${buildContainerId}:/app/${publishDirectory} ${path.join(buildAppDirectory, publishDirectory)} >> ${logPath} 2>> ${logPath} || { 
+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;

From bf65bc9462785e5125755529e1839fe48e0c01ef Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:25:06 -0600
Subject: [PATCH 2/2] chore(lint): format

---
 apps/dokploy/server/utils/builders/nixpacks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dokploy/server/utils/builders/nixpacks.ts b/apps/dokploy/server/utils/builders/nixpacks.ts
index 4ae4b2cb..2d81a7c0 100644
--- a/apps/dokploy/server/utils/builders/nixpacks.ts
+++ b/apps/dokploy/server/utils/builders/nixpacks.ts
@@ -1,4 +1,4 @@
-import { mkdirSync, type WriteStream, existsSync } from "node:fs";
+import { type WriteStream, existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
 import { buildStatic, getStaticCommand } from "@/server/utils/builders/static";
 import { nanoid } from "nanoid";