From ddd09412cd33bf7c429e0c2c9c04ca9e8d04eaca Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 12 Aug 2022 10:18:05 +0200
Subject: [PATCH] fix: Secrets

---
 apps/api/src/jobs/deployApplication.ts | 6 +++---
 apps/api/src/lib/buildPacks/common.ts  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts
index c780595f9..9782067d1 100644
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -192,9 +192,9 @@ import * as buildpacks from '../lib/buildPacks';
 							} catch (error) {
 								//
 							}
+							await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
 							if (!imageFound || deployNeeded) {
 							// if (true) {
-								await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
 								if (buildpacks[buildPack])
 									await buildpacks[buildPack]({
 										dockerId: destinationDocker.id,
@@ -248,11 +248,11 @@ import * as buildpacks from '../lib/buildPacks';
 								secrets.forEach((secret) => {
 									if (pullmergeRequestId) {
 										if (secret.isPRMRSecret) {
-											envs.push(`${secret.name}=${secret.value}`);
+											envs.push(`${secret.name}='${secret.value}'`);
 										}
 									} else {
 										if (!secret.isPRMRSecret) {
-											envs.push(`${secret.name}=${secret.value}`);
+											envs.push(`${secret.name}='${secret.value}'`);
 										}
 									}
 								});
diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts
index 3c34c5f31..62aa271c1 100644
--- a/apps/api/src/lib/buildPacks/common.ts
+++ b/apps/api/src/lib/buildPacks/common.ts
@@ -523,7 +523,7 @@ export async function buildImage({
 		await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
 	}
 	if (debug) {
-		await saveBuildLog({ line: `\n###############\nIMPORTANT: Due to some issues during implementing Remote Docker Engine, the builds logs are not streamed at the moment. You will see the full build log when the build is finished!\n###############`, buildId, applicationId });
+		await saveBuildLog({ line: `\n###############\nIMPORTANT: Due to some issues during implementing Remote Docker Engine, the builds logs are not streamed at the moment - but will be soon! You will see the full build log when the build is finished!\n###############`, buildId, applicationId });
 	}
 	if (!debug && isCache) {
 		await saveBuildLog({