LCOW: Ensure Linux-style paths on copy/add

John Howard · John Howard · commit 3bf17fc77981 · 2018-07-30T09:52:57.000-07:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/builder/dockerfile/internals.go b/builder/dockerfile/internals.go
@@ -479,11 +479,14 @@ func hostConfigFromOptions(options *types.ImageBuildOptions, isWCOW bool) *conta
 	return hc
 }
 
-// fromSlash works like filepath.FromSlash but with a given OS platform field
-func fromSlash(path, platform string) string {
-	if platform == "windows" {
+// fromSlash works like filepath.FromSlash but with a given target operating system
+func fromSlash(path, targetOS string) string {
+	if targetOS == "windows" { // WCOW force Windows slashes
 		return strings.Replace(path, "/", "\\", -1)
 	}
+	if targetOS == "linux" && runtime.GOOS == "windows" { // LCOW, force Linux slashes
+		return strings.Replace(path, "\\", "/", -1)
+	}
 	return path
 }
 

Original file line number	Diff line number	Diff line change
`@@ -479,11 +479,14 @@ func hostConfigFromOptions(options types.ImageBuildOptions, isWCOW bool) conta`
`479`	`479`	`return hc`
`480`	`480`	`}`
`481`	`481`
`482`		`-// fromSlash works like filepath.FromSlash but with a given OS platform field`
`483`		`-func fromSlash(path, platform string) string {`
`484`		`- if platform == "windows" {`
	`482`	`+// fromSlash works like filepath.FromSlash but with a given target operating system`
	`483`	`+func fromSlash(path, targetOS string) string {`
	`484`	`+ if targetOS == "windows" { // WCOW force Windows slashes`
`485`	`485`	`return strings.Replace(path, "/", "\\", -1)`
`486`	`486`	`}`
	`487`	`+ if targetOS == "linux" && runtime.GOOS == "windows" { // LCOW, force Linux slashes`
	`488`	`+ return strings.Replace(path, "\\", "/", -1)`
	`489`	`+ }`
`487`	`490`	`return path`
`488`	`491`	`}`
`489`	`492`