build: replace uses of archive.CanonicalTarNameForPath

thaJeztah · thaJeztah · commit fb0788f18fcd · 2022-08-31T17:55:03.000+02:00
As it's just an alias for filepath.IsAbs. Also added a normalize step in
TrimBuildFilesFromExcludes, so that callers are not _required_ to first
normalize the path.

We are considering deprecating and/or removing this function in the archive
package, so removing it in the cli code helps transitioning if we decide to
deprecate and/or remove it.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/image/build.go b/cli/command/image/build.go
@@ -265,7 +265,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
 		}
 
 		// And canonicalize dockerfile name to a platform-independent one
-		relDockerfile = archive.CanonicalTarNameForPath(relDockerfile)
+		relDockerfile = filepath.ToSlash(relDockerfile)
 
 		excludes = build.TrimBuildFilesFromExcludes(excludes, relDockerfile, options.dockerfileFromStdin())
 		buildCtx, err = archive.TarWithOptions(contextDir, &archive.TarOptions{
diff --git a/cli/command/image/build/dockerignore.go b/cli/command/image/build/dockerignore.go
@@ -32,6 +32,9 @@ func TrimBuildFilesFromExcludes(excludes []string, dockerfile string, dockerfile
 	if keep, _ := fileutils.Matches(".dockerignore", excludes); keep {
 		excludes = append(excludes, "!.dockerignore")
 	}
+
+	// canonicalize dockerfile name to be platform-independent.
+	dockerfile = filepath.ToSlash(dockerfile)
 	if keep, _ := fileutils.Matches(dockerfile, excludes); keep && !dockerfileFromStdin {
 		excludes = append(excludes, "!"+dockerfile)
 	}

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`// And canonicalize dockerfile name to a platform-independent one`
`268`		`- relDockerfile = archive.CanonicalTarNameForPath(relDockerfile)`
	`268`	`+ relDockerfile = filepath.ToSlash(relDockerfile)`
`269`	`269`
`270`	`270`	`excludes = build.TrimBuildFilesFromExcludes(excludes, relDockerfile, options.dockerfileFromStdin())`
`271`	`271`	`buildCtx, err = archive.TarWithOptions(contextDir, &archive.TarOptions{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ func TrimBuildFilesFromExcludes(excludes []string, dockerfile string, dockerfile`
`32`	`32`	`if keep, _ := fileutils.Matches(".dockerignore", excludes); keep {`
`33`	`33`	`excludes = append(excludes, "!.dockerignore")`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ // canonicalize dockerfile name to be platform-independent.`
	`37`	`+ dockerfile = filepath.ToSlash(dockerfile)`
`35`	`38`	`if keep, _ := fileutils.Matches(dockerfile, excludes); keep && !dockerfileFromStdin {`
`36`	`39`	`excludes = append(excludes, "!"+dockerfile)`
`37`	`40`	`}`