diff options
| author | Joffrey F <joffrey@docker.com> | 2015-06-16 15:09:58 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-06-16 15:09:58 -0700 |
| commit | 164593e0490448fc15fc3c1f52f6abc05b9a2602 (patch) | |
| tree | 893debb843840472ce1e3fe06a0974c90d503cd6 | |
| parent | 225211e5adf985ae5e53ef93b4bfde8146b43a60 (diff) | |
| parent | de5f45491f851922104b40c23abf95c1219a9a08 (diff) | |
| download | docker-py-164593e0490448fc15fc3c1f52f6abc05b9a2602.tar.gz | |
Merge branch 'bo0ts-Decode-for-build' into 1.3.0-dev
| -rw-r--r-- | docker/client.py | 5 | ||||
| -rw-r--r-- | docs/api.md | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docker/client.py b/docker/client.py index b664806..dc76f5d 100644 --- a/docker/client.py +++ b/docker/client.py @@ -307,7 +307,8 @@ class Client(requests.Session): def build(self, path=None, tag=None, quiet=False, fileobj=None, nocache=False, rm=False, stream=False, timeout=None, custom_context=False, encoding=None, pull=True, - forcerm=False, dockerfile=None, container_limits=None): + forcerm=False, dockerfile=None, container_limits=None, + decode=False): remote = context = headers = None container_limits = container_limits or {} if path is None and fileobj is None: @@ -398,7 +399,7 @@ class Client(requests.Session): context.close() if stream: - return self._stream_helper(response) + return self._stream_helper(response, decode=decode) else: output = self._result(response) srch = r'Successfully built ([0-9a-f]+)' diff --git a/docs/api.md b/docs/api.md index 26dfe60..573b041 100644 --- a/docs/api.md +++ b/docs/api.md @@ -71,8 +71,10 @@ correct value (e.g `gzip`). - memswap (int): Total memory (memory + swap), -1 to disable swap - cpushares (int): CPU shares (relative weight) - cpusetcpus (str): CPUs in which to allow exection, e.g., `"0-3"`, `"0,1"` +* decode (bool): If set to `True`, the returned stream will be decoded into + dicts on the fly. Default `False`. -**Returns** (generator): A generator of the build output +**Returns** (generator): A generator for the build output ```python >>> from io import BytesIO |