beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33033 from YuPengZTE/devReadAll

Browse source 
check err
This commit is contained in:
Akihiro Suda 2017-05-05 22:33:23 +09:00 committed by GitHub
commit b61ffbfb52
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builder/remotecontext/detect.go
View file

@ -125,6 +125,9 @@ func removeDockerfile(c modifiableContext, filesToRemove ...string) error {
return err return err
} }
excludes, err := dockerignore.ReadAll(f) excludes, err := dockerignore.ReadAll(f)
if err != nil {
return err
}
f.Close() f.Close()
filesToRemove = append([]string{".dockerignore"}, filesToRemove...) filesToRemove = append([]string{".dockerignore"}, filesToRemove...)
for _, fileToRemove := range filesToRemove { for _, fileToRemove := range filesToRemove {