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] 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)