diff options
| author | Chris Houseknecht <chouseknecht@ansible.com> | 2016-10-03 10:32:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 10:32:04 -0400 |
| commit | 90af27f20f6a16591f652e0d9ef6fd83d1a7a6e2 (patch) | |
| tree | 9a77e76bf8a2967d7217311b66eec8132c91baad | |
| parent | 6c4d71a7fab60601846363506bc8eebe9c52c240 (diff) | |
| parent | 523780a7ca78108829aeaff59754edb7d96ba053 (diff) | |
| download | ansible-modules-core-90af27f20f6a16591f652e0d9ef6fd83d1a7a6e2.tar.gz | |
Merge pull request #5050 from chouseknecht/devel
Fix intermittent image push error
| -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']) |