Merge pull request #13130 from nalind/slashify-dockerfile-4.0

openshift-merge-robot · web-flow · commit 337f706f6118 · 2022-02-03T13:15:17.000-05:00
[v4.0] pkg/bindings/images.Build(): slashify "dockerfile" values, too
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
@@ -332,7 +332,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	}
 
 	tarContent := []string{options.ContextDirectory}
-	newContainerFiles := []string{}
+	newContainerFiles := []string{} // dockerfile paths, relative to context dir, ToSlash()ed
 
 	dontexcludes := []string{"!Dockerfile", "!Containerfile", "!.dockerignore", "!.containerignore"}
 	for _, c := range containerFiles {
@@ -380,7 +380,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 				tarContent = append(tarContent, containerfile)
 			}
 		}
-		newContainerFiles = append(newContainerFiles, containerfile)
+		newContainerFiles = append(newContainerFiles, filepath.ToSlash(containerfile))
 	}
 	if len(newContainerFiles) > 0 {
 		cFileJSON, err := json.Marshal(newContainerFiles)

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`tarContent := []string{options.ContextDirectory}`
`335`		`- newContainerFiles := []string{}`
	`335`	`+ newContainerFiles := []string{} // dockerfile paths, relative to context dir, ToSlash()ed`
`336`	`336`
`337`	`337`	`dontexcludes := []string{"!Dockerfile", "!Containerfile", "!.dockerignore", "!.containerignore"}`
`338`	`338`	`for _, c := range containerFiles {`
`@@ -380,7 +380,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO`
`380`	`380`	`tarContent = append(tarContent, containerfile)`
`381`	`381`	`}`
`382`	`382`	`}`
`383`		`- newContainerFiles = append(newContainerFiles, containerfile)`
	`383`	`+ newContainerFiles = append(newContainerFiles, filepath.ToSlash(containerfile))`
`384`	`384`	`}`
`385`	`385`	`if len(newContainerFiles) > 0 {`
`386`	`386`	`cFileJSON, err := json.Marshal(newContainerFiles)`