diff options
Diffstat (limited to 'cloud/docker/docker.py')
| -rw-r--r-- | cloud/docker/docker.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index ab9f13f5..f299454f 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -1237,6 +1237,11 @@ class DockerManager(object): changes = list(self.client.pull(image, tag=tag, stream=True, **extra_params)) try: last = changes[-1] + # seems Docker 1.8 puts an empty dict at the end of the + # stream; catch that and get the previous instead + # https://github.com/ansible/ansible-modules-core/issues/2043 + if last.strip() == '{}': + last = changes[-2] except IndexError: last = '{}' status = json.loads(last).get('status', '') |