Browse Source

Merge pull request #6991 from bobrik/empty-dockerignore

Skipping empty lines in .dockerignore
Michael Crosby 11 years ago
parent
commit
1583e7af41
1 changed files with 4 additions and 0 deletions
  1. 4 0
      api/client/commands.go

+ 4 - 0
api/client/commands.go

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