From 05df2c97336b98fd08e7abcc1d4eb54b34c40ab7 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon@eevul.org>
Date: Fri, 12 May 2023 13:47:25 +0200
Subject: [PATCH] Fix prefix path for alt images

---
 Dockerfile      |  3 ++-
 JenkinsEnv.json |  4 ++++
 Jenkinsfile     | 12 ++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c862973..7482083 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,9 @@ FROM amigadev/docker-base:latest
 
 ARG BUILD_OS
 ARG BUILD_PFX
+ARG PREFIX
 
-ENV CROSS_PFX $BUILD_PFX
+ENV CROSS_PFX $PREFIX
 ENV OS_NAME $BUILD_OS
 
 COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
diff --git a/JenkinsEnv.json b/JenkinsEnv.json
index bd068b2..dbba89d 100644
--- a/JenkinsEnv.json
+++ b/JenkinsEnv.json
@@ -4,6 +4,7 @@
             "DockerRoot": "amigadev",
             "DockerImage": "crosstools",
             "DockerTag": "m68k-amigaos",
+            "Prefix": "",
             "Dockerfile": "Dockerfile",
             "BuildIfSuccessful": "",
             "BuildParam": "AmigaOS"
@@ -12,6 +13,7 @@
             "DockerRoot": "amigadev",
             "DockerImage": "crosstools",
             "DockerTag": "m68k-amigaos-gcc10",
+            "Prefix": "m68k-amigaos",
             "Dockerfile": "Dockerfile",
             "BuildIfSuccessful": "",
             "BuildParam": "AmigaOS"
@@ -20,6 +22,7 @@
             "DockerRoot": "amigadev",
             "DockerImage": "crosstools",
             "DockerTag": "ppc-amigaos",
+            "Prefix": "",
             "Dockerfile": "Dockerfile",
             "BuildIfSuccessful": "",
             "BuildParam": "AmigaOS"
@@ -29,6 +32,7 @@
             "DockerRoot": "amigadev",
             "DockerImage": "crosstools",
             "DockerTag": "ppc-morphos",
+            "Prefix": "",
             "Dockerfile": "Dockerfile",
             "BuildIfSuccessful": "",
             "BuildParam": "MorphOS"
diff --git a/Jenkinsfile b/Jenkinsfile
index 92a66ff..8d71925 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,7 @@ def killall_jobs() {
 	echo "Done killing";
 }
 
-def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD_OS) {
+def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD_OS, PREFIX) {
 	def fixed_job_name = env.JOB_NAME.replace('%2F','/');
 	try {
 		checkout scm;
@@ -55,10 +55,14 @@ def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD
 			throw new Exception("Invalid branch, stopping build!");
 		}
 
+		if (PREFIX.equals('')) {
+			PREFIX = "${tag}";
+		}
+
 		docker.withRegistry("https://index.docker.io/v1/", "dockerhub") {
 			def customImage
 			stage("Building ${DOCKERIMAGE}:${tag}...") {
-				customImage = docker.build("${DOCKER_ROOT}/${DOCKERIMAGE}:${tag}", "--build-arg BUILDENV=${buildenv} --build-arg BUILD_OS=${BUILD_OS} --build-arg BUILD_PFX=${tag} --network=host --pull -f ${DOCKERFILE} .");
+				customImage = docker.build("${DOCKER_ROOT}/${DOCKERIMAGE}:${tag}", "--build-arg BUILDENV=${buildenv} --build-arg BUILD_OS=${BUILD_OS} --build-arg BUILD_PFX=${tag} --build-arg PREFIX=${PREFIX} --network=host --pull -f ${DOCKERFILE} .");
 			}
 
 			stage("Pushing to docker hub registry...") {
@@ -97,7 +101,7 @@ node('master') {
 		project.builds.each { v ->
 			branches["Build ${v.DockerRoot}/${v.DockerImage}:${v.DockerTag}"] = { 
 				node {
-					buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam);
+					buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam, v.Prefix);
 				}
 			}
 		}
@@ -107,7 +111,7 @@ node('master') {
 			if ("${v.DockerTag}".equals("${BUILD_IMAGE}")) {
 				branches["Build ${v.DockerRoot}/${v.DockerImage}:${v.DockerTag}"] = { 
 					node {
-						buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam);
+						buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam, v.Prefix);
 					}
 				}
 			}