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

Fix the order of pull

This commit is contained in:
Derek Hammer 2014-12-15 10:49:37 -08:00
parent d8e8400419
commit 7426c52f0e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/client.py
View File

@ -408,7 +408,7 @@ class Client(requests.Session):
def build(self, path=None, tag=None, quiet=False, fileobj=None, def build(self, path=None, tag=None, quiet=False, fileobj=None,
nocache=False, rm=False, stream=False, timeout=None, nocache=False, rm=False, stream=False, timeout=None,
pull=False, custom_context=False, encoding=None): custom_context=False, encoding=None, pull=True):
remote = context = headers = None remote = context = headers = None
if path is None and fileobj is None: if path is None and fileobj is None:
raise TypeError("Either path or fileobj needs to be provided.") raise TypeError("Either path or fileobj needs to be provided.")
@ -439,10 +439,10 @@ class Client(requests.Session):
params = { params = {
't': tag, 't': tag,
'remote': remote, 'remote': remote,
'pull': pull,
'q': quiet, 'q': quiet,
'nocache': nocache, 'nocache': nocache,
'rm': rm 'rm': rm,
'pull': pull
} }
if context is not None: if context is not None:

2
docs/api.md
View File

@ -56,9 +56,9 @@ correct value (e.g `gzip`).
* stream (bool): Return a blocking generator you can iterate over to retrieve * stream (bool): Return a blocking generator you can iterate over to retrieve
build output as it happens build output as it happens
* timeout (int): HTTP timeout * timeout (int): HTTP timeout
* pull (bool): Downloads any updates to the FROM image in Dockerfiles
* custom_context (bool): Optional if using `fileobj` * custom_context (bool): Optional if using `fileobj`
* encoding (str): The encoding for a stream. Set to `gzip` for compressing * encoding (str): The encoding for a stream. Set to `gzip` for compressing
* pull (bool): Downloads any updates to the FROM image in Dockerfiles
**Returns** (generator): A generator of the build output **Returns** (generator): A generator of the build output