From 21dfa5227cf21c25750404eb5e327125f76125d3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@protonmail.com>
Date: Mon, 26 Sep 2022 20:37:58 +0000
Subject: [PATCH] fix: logs in docker bp

---
 apps/api/src/jobs/deployApplication.ts |  1 -
 apps/api/src/lib/buildPacks/common.ts  |  4 +-
 apps/api/src/lib/buildPacks/docker.ts  | 55 ++++++++++++--------------
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts
index 89859620f..ba0281b02 100644
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -211,7 +211,6 @@ import * as buildpacks from '../lib/buildPacks';
 										//
 									}
 									await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
-
 									if (forceRebuild) deployNeeded = true
 									if (!imageFound || deployNeeded) {
 										// if (true) {
diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts
index fc9e3a768..d91dc097f 100644
--- a/apps/api/src/lib/buildPacks/common.ts
+++ b/apps/api/src/lib/buildPacks/common.ts
@@ -586,9 +586,9 @@ export async function buildImage({
 	} else {
 		await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
 	}
-	if (!debug && isCache) {
+	if (!debug) {
 		await saveBuildLog({
-			line: `Debug turned off. To see more details, allow it in the configuration.`,
+			line: `Debug turned off. To see more details, allow it in the features tab.`,
 			buildId,
 			applicationId
 		});
diff --git a/apps/api/src/lib/buildPacks/docker.ts b/apps/api/src/lib/buildPacks/docker.ts
index e8cfd89bc..777dda157 100644
--- a/apps/api/src/lib/buildPacks/docker.ts
+++ b/apps/api/src/lib/buildPacks/docker.ts
@@ -13,36 +13,33 @@ export default async function (data) {
 		pullmergeRequestId,
 		dockerFileLocation
 	} = data
-	try {
-		const file = `${workdir}${baseDirectory}${dockerFileLocation}`;
-		data.workdir = `${workdir}${baseDirectory}`;
-		const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8'))
-			.toString()
-			.trim()
-			.split('\n');
-		Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-		if (secrets.length > 0) {
-			secrets.forEach((secret) => {
-				if (secret.isBuildSecret) {
-					if (
-						(pullmergeRequestId && secret.isPRMRSecret) ||
-						(!pullmergeRequestId && !secret.isPRMRSecret)
-					) {
-						Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
+	const file = `${workdir}${baseDirectory}${dockerFileLocation}`;
+	data.workdir = `${workdir}${baseDirectory}`;
+	const DockerfileRaw = await fs.readFile(`${file}`, 'utf8')
+	const Dockerfile: Array<string> = DockerfileRaw
+		.toString()
+		.trim()
+		.split('\n');
+	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
+	if (secrets.length > 0) {
+		secrets.forEach((secret) => {
+			if (secret.isBuildSecret) {
+				if (
+					(pullmergeRequestId && secret.isPRMRSecret) ||
+					(!pullmergeRequestId && !secret.isPRMRSecret)
+				) {
+					Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
 
-						Dockerfile.forEach((line, index) => {
-							if (line.startsWith('FROM')) {
-								Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
-							}
-						});
-					}
+					Dockerfile.forEach((line, index) => {
+						if (line.startsWith('FROM')) {
+							Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
+						}
+					});
 				}
-			});
-		}
-
-		await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
-		await buildImage(data);
-	} catch (error) {
-		throw error;
+			}
+		});
 	}
+
+	await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
+	await buildImage(data);
 }