summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/errors.py4
-rw-r--r--docker/models/images.py5
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/errors.py b/docker/errors.py
index 50423a2..eeeac57 100644
--- a/docker/errors.py
+++ b/docker/errors.py
@@ -144,6 +144,10 @@ class BuildError(Exception):
pass
+class ImageLoadError(DockerException):
+ pass
+
+
def create_unexpected_kwargs_error(name, kwargs):
quoted_kwargs = ["'{}'".format(k) for k in sorted(kwargs)]
text = ["{}() ".format(name)]
diff --git a/docker/models/images.py b/docker/models/images.py
index 4372730..dcdeac9 100644
--- a/docker/models/images.py
+++ b/docker/models/images.py
@@ -3,7 +3,7 @@ import re
import six
from ..api import APIClient
-from ..errors import BuildError
+from ..errors import BuildError, ImageLoadError
from ..utils.json_stream import json_stream
from .resource import Collection, Model
@@ -258,6 +258,9 @@ class ImageCollection(Collection):
if match:
image_id = match.group(2)
images.append(image_id)
+ if 'error' in chunk:
+ raise ImageLoadError(chunk['error'])
+
return [self.get(i) for i in images]
def pull(self, name, tag=None, **kwargs):