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 #271 from robertglen/byteIO-seekfix 

Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles
This commit is contained in:
Joffrey F 2014-12-15 16:26:52 -08:00
parent e8c9e6e3f2 adcfa4b29e
commit 7fcddc22ce
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/utils/utils.py
View File

@ -41,9 +41,11 @@ def mkbuildcontext(dockerfile):
'Dockerfiles with Python 3') 'Dockerfiles with Python 3')
else: else:
dfinfo.size = len(dockerfile.getvalue()) dfinfo.size = len(dockerfile.getvalue())
dockerfile.seek(0)
elif isinstance(dockerfile, io.BytesIO): elif isinstance(dockerfile, io.BytesIO):
dfinfo = tarfile.TarInfo('Dockerfile') dfinfo = tarfile.TarInfo('Dockerfile')
dfinfo.size = len(dockerfile.getvalue()) dfinfo.size = len(dockerfile.getvalue())
dockerfile.seek(0)
else: else:
dfinfo = t.gettarinfo(fileobj=dockerfile, arcname='Dockerfile') dfinfo = t.gettarinfo(fileobj=dockerfile, arcname='Dockerfile')
t.addfile(dfinfo, dockerfile) t.addfile(dfinfo, dockerfile)