From f47a491cb1b39caeeefcd66754cc9c071fe6e7c4 Mon Sep 17 00:00:00 2001 From: Ian Babrou Date: Sat, 12 Jul 2014 13:38:33 +0400 Subject: [PATCH] Skipping empty lines in .dockerignore Docker-DCO-1.1-Signed-off-by: Ian Babrou (github: bobrik) Upstream-commit: 1a1ee73e38eb54f9b5a3fd03f98c4bb80dde1bbb Component: engine --- components/engine/api/client/commands.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/api/client/commands.go b/components/engine/api/client/commands.go index 787a2bdc7d..4e196d11a2 100644 --- a/components/engine/api/client/commands.go +++ b/components/engine/api/client/commands.go @@ -171,6 +171,10 @@ func (cli *DockerCli) CmdBuild(args ...string) error { return fmt.Errorf("Error reading .dockerignore: '%s'", err) } else if err == nil { for _, pattern := range strings.Split(string(ignore), "\n") { + if pattern == "" { + continue + } + ok, err := filepath.Match(pattern, "Dockerfile") if err != nil { utils.Errorf("Bad .dockerignore pattern: '%s', error: %s", pattern, err)