fix docker build output parser

dmake/build.py

@@ -212,15 +212,16 @@ def _attach_labels(self):
     def _do_build(self, params):
         response = self.docker.build(**params)
         image_id = None
-        for line in response:
-            ret = json.loads(line)
-            if 'stream' in ret:
-                msg = ret['stream']
-                LOG.debug("%s: %s" % (self.name, msg))
-            if 'errorDetail' in ret:
-                raise BuildFailed(ret['errorDetail']['message'])
-            if 'Successfully built' in ret.get('stream', ''):
-                image_id = ret['stream'].strip().split()[-1]
+        for data in response:
+            for line in data.splitlines():
+                ret = json.loads(line)
+                if 'stream' in ret:
+                    msg = ret['stream']
+                    LOG.debug("%s: %s" % (self.name, msg))
+                if 'errorDetail' in ret:
+                    raise BuildFailed(ret['errorDetail']['message'])
+                if 'Successfully built' in ret.get('stream', ''):
+                    image_id = ret['stream'].strip().split()[-1]
         return image_id
 
     def _do_push(self, repo, tag):

dmake/utils.py

@@ -41,7 +41,7 @@ def docker_client():
     if _docker is None:
         params = docker_utils.kwargs_from_env()
         params['version'] = 'auto'
-        _docker = docker.client.Client(**params)
+        _docker = docker.api.client.APIClient(**params)
     return _docker
 
 

requirements.pip

@@ -1,2 +1,2 @@
 PyYAML >= 3.10, < 4
-docker-py >= 1.8.1, < 2
+docker >= 2.1.0, < 3