mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-12-13 22:02:25 +03:00
Code Activity

abort on error and fix debug

Browse Source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux
2014-06-26 02:12:18 +00:00
parent 42ca8a064b
commit 0098360726
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/client/commands.go
View File

@@ -167,8 +167,9 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
options := &archive.TarOptions{
Compression: archive.Uncompressed,
}
ignoreFile := path.Join(root, ".dockerignore")
if ignore, err := ioutil.ReadFile(ignoreFile); err == nil {
if ignore, err := ioutil.ReadFile(path.Join(root, ".dockerignore")); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("Error reading .dockerignore: '%s'", err)
} else if err == nil {
for _, pattern := range strings.Split(string(ignore), "\n") {
ok, err := filepath.Match(pattern, "Dockerfile")
if err != nil {