diff options
| author | Chris Houseknecht <chouseknecht@ansible.com> | 2016-09-27 00:36:11 -0400 |
|---|---|---|
| committer | Chris Houseknecht <chouseknecht@ansible.com> | 2016-09-27 01:17:26 -0400 |
| commit | 523780a7ca78108829aeaff59754edb7d96ba053 (patch) | |
| tree | ddc219256495bf12b6719665312654f359dca72a | |
| parent | 84020b39ee79143291a6cc559fc4960b1f2804a9 (diff) | |
| download | ansible-modules-core-523780a7ca78108829aeaff59754edb7d96ba053.tar.gz | |
Let docker-py handle decoding and JSON parsing of stream data. Fixes #4930.
| -rw-r--r-- | cloud/docker/docker_image.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloud/docker/docker_image.py b/cloud/docker/docker_image.py index 0a9ab090..7d97d984 100644 --- a/cloud/docker/docker_image.py +++ b/cloud/docker/docker_image.py @@ -424,8 +424,7 @@ class ImageManager(DockerBaseClass): if not self.check_mode: status = None try: - for line in self.client.push(repository, tag=tag, stream=True): - line = json.loads(line) + for line in self.client.push(repository, tag=tag, stream=True, decode=True): self.log(line, pretty_print=True) if line.get('errorDetail'): raise Exception(line['errorDetail']['message']) |