docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Windows : fix EOL of .dockerignore file
This commit is contained in:
Joffrey F 2015-03-20 15:56:50 -07:00
parent 0e8fc634b2 3804bcb8cc
commit 96440cccb0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/client.py
View File

@ -322,7 +322,7 @@ class Client(requests.Session):
exclude = None exclude = None
if os.path.exists(dockerignore): if os.path.exists(dockerignore):
with open(dockerignore, 'r') as f: 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 # These are handled by the docker daemon and should not be
# excluded on the client # excluded on the client
if 'Dockerfile' in exclude: if 'Dockerfile' in exclude: