mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-12-12 10:01:33 +03:00
Code Activity

Merge pull request #8739 from duglin/CleanupDockerIgnores

Browse Source 
Do some cleanup on .dockerignore paths
This commit is contained in:
Tibor Vass
2014-11-03 16:05:24 -05:00
parent 38d3888194 c0f0f5c988
commit a85f58719f
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/client/commands.go
View File

@@ -144,6 +144,11 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
return fmt.Errorf("Error reading .dockerignore: '%s'", err)
}
for _, pattern := range strings.Split(string(ignore), "\n") {
pattern = strings.TrimSpace(pattern)
if pattern == "" {
continue
}
pattern = filepath.Clean(pattern)
ok, err := filepath.Match(pattern, "Dockerfile")
if err != nil {
return fmt.Errorf("Bad .dockerignore pattern: '%s', error: %s", pattern, err)