Merge pull request #531 from josephpage/dockerignore-eof-windows

Windows : fix EOL of .dockerignore file
2015-03-20 15:56:50 -07:00 · 2015-03-20 15:56:50 -07:00 · 96440cccb0
parent 0e8fc634b2 3804bcb8cc
commit 96440cccb0
1 changed files with 1 additions and 1 deletions
--- a/docker/client.py
+++ b/docker/client.py
@ -322,7 +322,7 @@ class Client(requests.Session):
            exclude = None
            if os.path.exists(dockerignore):
                with open(dockerignore, 'r') as f:
-                    exclude = list(filter(bool, f.read().split('\n')))
+                    exclude = list(filter(bool, f.read().splitlines()))
                    # These are handled by the docker daemon and should not be
                    # excluded on the client
                    if 'Dockerfile' in exclude: