From c154fa98d0fda9143848c0048fe2bb8d1a30b15e Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:20:28 +0200
Subject: [PATCH 1/4] go mod tidy

---
 backend/go-app/go.sum | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum
index 3a682615..28b022f4 100644
--- a/backend/go-app/go.sum
+++ b/backend/go-app/go.sum
@@ -334,8 +334,8 @@ github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdR
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/shuffle/shuffle-shared v0.6.74 h1:os3BDSFZnl4U8ZgsTAY8IsTDADcMXhbc1rS9UMa0BIY=
-github.com/shuffle/shuffle-shared v0.6.74/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
+github.com/shuffle/shuffle-shared v0.6.77 h1:KKtM50xW2DLuRHINxhp3uXrNH0AhiwkeiiU93a8fB3A=
+github.com/shuffle/shuffle-shared v0.6.77/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=

From 7b5fe4a84c39ee2bcb51ef51bacf469d6e2978be Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:21:05 +0200
Subject: [PATCH 2/4] Use NodeName instead of NodeSelector

---
 backend/go-app/docker.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go
index 03312201..ad016745 100755
--- a/backend/go-app/docker.go
+++ b/backend/go-app/docker.go
@@ -420,9 +420,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
 								},
 							},
 						},
-						NodeSelector: map[string]string{
-							"node": backendNodeName,
-						},
+						NodeName:      backendNodeName,
 						RestartPolicy: corev1.RestartPolicyNever,
 						Volumes: []corev1.Volume{
 							{

From 90b62a5e9297672b46935439debf984c38f3247c Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:22:32 +0200
Subject: [PATCH 3/4] Fix --dockerfile flag

---
 backend/go-app/docker.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go
index ad016745..d44e5f82 100755
--- a/backend/go-app/docker.go
+++ b/backend/go-app/docker.go
@@ -372,7 +372,6 @@ func buildImage(tags []string, dockerfileFolder string) error {
 		contextDir := strings.Replace(dockerfileFolder, "Dockerfile", "", -1)
 		contextDir = "/app/" + contextDir
 		log.Print("contextDir: ", contextDir)
-		dockerFile := "./Dockerfile"
 
 		client, err := getK8sClient()
 		if err != nil {

From 840288c226cabb69db3e595cff9c531a842e4e98 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:23:02 +0200
Subject: [PATCH 4/4] Use filepath module for constructing contextDir

---
 backend/go-app/docker.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/go-app/docker.go b/backend/go-app/docker.go
index d44e5f82..a8a34072 100755
--- a/backend/go-app/docker.go
+++ b/backend/go-app/docker.go
@@ -349,7 +349,7 @@ func deleteJob(client *kubernetes.Clientset, jobName, namespace string) error {
 	})
 }
 
-func buildImage(tags []string, dockerfileFolder string) error {
+func buildImage(tags []string, dockerfileLocation string) error {
 
 	isKubernetes := false
 	if os.Getenv("IS_KUBERNETES") == "true" {
@@ -369,8 +369,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
 
 		log.Printf("[INFO] registry name: %s", registryName)
 
-		contextDir := strings.Replace(dockerfileFolder, "Dockerfile", "", -1)
-		contextDir = "/app/" + contextDir
+		contextDir := filepath.Join("/app/", filepath.Dir(dockerfileLocation))
 		log.Print("contextDir: ", contextDir)
 
 		client, err := getK8sClient()
@@ -406,7 +405,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
 								Image: "gcr.io/kaniko-project/executor:latest",
 								Args: []string{
 									"--verbosity=debug",
-									"--dockerfile=" + dockerFile,
+									"--dockerfile=Dockerfile",
 									"--context=dir://" + contextDir,
 									"--skip-tls-verify",
 									"--destination=" + registryName + "/" + tags[1],
@@ -483,7 +482,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
 		}
 
 		log.Printf("[INFO] Docker Tags: %s", tags)
-		dockerfileSplit := strings.Split(dockerfileFolder, "/")
+		dockerfileSplit := strings.Split(dockerfileLocation, "/")
 
 		// Create a buffer
 		buf := new(bytes.Buffer)