toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1163 from thaJeztah/bump_engine

Browse Source 
bump docker and dependencies
Upstream-commit: f285fe67e9
Component: cli
This commit is contained in:
Silvin
2018-07-04 16:17:12 +02:00
committed by GitHub
parent a72fa5b176 f9fb05a1c6
commit 76a7769a26
44 changed files with 2776 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/cli/cli/command/image/build.go
View File

@ -270,10 +270,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
}
// And canonicalize dockerfile name to a platform-independent one
relDockerfile, err = archive.CanonicalTarNameForPath(relDockerfile)
if err != nil {
return errors.Errorf("cannot canonicalize dockerfile path %s: %v", relDockerfile, err)
}
relDockerfile = archive.CanonicalTarNameForPath(relDockerfile)
excludes = build.TrimBuildFilesFromExcludes(excludes, relDockerfile, options.dockerfileFromStdin())
buildCtx, err = archive.TarWithOptions(contextDir, &archive.TarOptions{