From fd652bfce6aa18344049e6c01d1690541e1cad2f Mon Sep 17 00:00:00 2001
From: Philip Schmidt <philip.schmidt@networkteam.com>
Date: Wed, 6 Apr 2022 18:33:02 +0200
Subject: [PATCH] write args at the beginning of dockerfile and inherit them
 for each stage

---
 src/lib/buildPacks/docker.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/lib/buildPacks/docker.ts b/src/lib/buildPacks/docker.ts
index 371ffed82..2db5d567c 100644
--- a/src/lib/buildPacks/docker.ts
+++ b/src/lib/buildPacks/docker.ts
@@ -26,14 +26,17 @@ export default async function ({
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
 				if (secret.isBuildSecret) {
-					if (pullmergeRequestId) {
-						if (secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-						}
-					} else {
-						if (!secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-						}
+					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}`);
+							}
+						});
 					}
 				}
 			});