backport various docker_common fixes from devel

(cherry picked from commit b5c95ea6fa)
9 years ago · 066a360a36
parent 731422a6dc
commit 066a360a36
1 changed files with 1 additions and 2 deletions
--- a/lib/ansible/module_utils/docker_common.py
+++ b/lib/ansible/module_utils/docker_common.py
@ -446,8 +446,7 @@ class AnsibleDockerClient(Client):
        '''
        self.log("Pulling image %s:%s" % (name, tag))
        try:
-            for line in self.pull(name, tag=tag, stream=True):
-                line = json.loads(line)
+            for line in self.pull(name, tag=tag, stream=True, decode=True):
                self.log(line, pretty_print=True)
                if line.get('error'):
                    if line.get('errorDetail'):