Merge pull request #7373 from sivel/issue/7367

Handle ValueError during json.loads of json data from build

library/cloud/docker_image

@@ -140,7 +140,10 @@ class DockerImageManager:
             if not chunk:
                 continue
 
-            chunk_json = json.loads(chunk)
+            try:
+                chunk_json = json.loads(chunk)
+            except ValueError:
+                continue
 
             if 'error' in chunk_json:
                 self.error_msg = chunk_json['error']
@@ -153,6 +156,12 @@ class DockerImageManager:
                 if match:
                     image_id = match.group(1)
 
+        # Just in case we skipped evaluating the JSON returned from build
+        # during every iteration, add an error if the image_id was never
+        # populated
+        if not image_id:
+            self.error_msg = 'Unknown error encountered'
+
         return image_id
 
     def has_changed(self):