marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use filepath module for constructing contextDir

Browse Source
This commit is contained in:
Pascal Sthamer
2024-10-23 12:23:02 +02:00
parent 90b62a5e92
commit 840288c226
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/docker.go
+4 -5
View File
@@ -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 isKubernetes := false
if os.Getenv("IS_KUBERNETES") == "true" { if os.Getenv("IS_KUBERNETES") == "true" {
@@ -369,8 +369,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
log.Printf("[INFO] registry name: %s", registryName) log.Printf("[INFO] registry name: %s", registryName)
contextDir := strings.Replace(dockerfileFolder, "Dockerfile", "", -1) contextDir := filepath.Join("/app/", filepath.Dir(dockerfileLocation))
contextDir = "/app/" + contextDir
log.Print("contextDir: ", contextDir) log.Print("contextDir: ", contextDir)
client, err := getK8sClient() client, err := getK8sClient()
@@ -406,7 +405,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
Image: "gcr.io/kaniko-project/executor:latest", Image: "gcr.io/kaniko-project/executor:latest",
Args: []string{ Args: []string{
"--verbosity=debug", "--verbosity=debug",
"--dockerfile=" + dockerFile, "--dockerfile=Dockerfile",
"--context=dir://" + contextDir, "--context=dir://" + contextDir,
"--skip-tls-verify", "--skip-tls-verify",
"--destination=" + registryName + "/" + tags[1], "--destination=" + registryName + "/" + tags[1],
@@ -483,7 +482,7 @@ func buildImage(tags []string, dockerfileFolder string) error {
} }
log.Printf("[INFO] Docker Tags: %s", tags) log.Printf("[INFO] Docker Tags: %s", tags)
dockerfileSplit := strings.Split(dockerfileFolder, "/") dockerfileSplit := strings.Split(dockerfileLocation, "/")
// Create a buffer // Create a buffer
buf := new(bytes.Buffer) buf := new(bytes.Buffer)