diff options
| author | Derek Hammer <derek.r.hammer@gmail.com> | 2014-12-15 10:49:37 -0800 |
|---|---|---|
| committer | Derek Hammer <derek.r.hammer@gmail.com> | 2014-12-15 10:49:37 -0800 |
| commit | 7426c52f0ee2b74d9736e0c255b1bfacb8f8f044 (patch) | |
| tree | d9427810ea9c68525410243e14edd82361bed104 | |
| parent | d8e84004192dc0c617a9a0a6b9fb0b18aeaaa038 (diff) | |
| download | docker-py-7426c52f0ee2b74d9736e0c255b1bfacb8f8f044.tar.gz | |
Fix the order of pull
| -rw-r--r-- | docker/client.py | 6 | ||||
| -rw-r--r-- | docs/api.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/client.py b/docker/client.py index 8d31213..bb27a14 100644 --- a/docker/client.py +++ b/docker/client.py @@ -408,7 +408,7 @@ class Client(requests.Session): def build(self, path=None, tag=None, quiet=False, fileobj=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 if path is None and fileobj is None: raise TypeError("Either path or fileobj needs to be provided.") @@ -439,10 +439,10 @@ class Client(requests.Session): params = { 't': tag, 'remote': remote, - 'pull': pull, 'q': quiet, 'nocache': nocache, - 'rm': rm + 'rm': rm, + 'pull': pull } if context is not None: diff --git a/docs/api.md b/docs/api.md index 50e4187..b49c0d5 100644 --- a/docs/api.md +++ b/docs/api.md @@ -56,9 +56,9 @@ correct value (e.g `gzip`). * stream (bool): Return a blocking generator you can iterate over to retrieve build output as it happens * timeout (int): HTTP timeout -* pull (bool): Downloads any updates to the FROM image in Dockerfiles * custom_context (bool): Optional if using `fileobj` * 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 |