docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1577-multi-success-message' of https://github.com/aaronthebaron/docker-py into aaronthebaron-1577-multi-success-message

This commit is contained in:
Joffrey F 2017-05-05 15:01:16 -07:00
parent 0a94e5a945 a164f4661b
commit e19aad860c
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker/models/images.py
View File

@ -166,18 +166,18 @@ class ImageCollection(Collection):
resp = self.client.api.build(**kwargs)
if isinstance(resp, six.string_types):
return self.get(resp)
events = list(json_stream(resp))
if not events:
return BuildError('Unknown')
event = events[-1]
if 'stream' in event:
match = re.search(r'(Successfully built |sha256:)([0-9a-f]+)',
event.get('stream', ''))
if match:
image_id = match.group(2)
return self.get(image_id)
for chunk in json_stream(resp):
if 'error' in chunk:
raise BuildError(chunk['error'])
break
if 'stream' in chunk:
match = re.search(r'(Successfully built |sha256:)([0-9a-f]+)',
chunk['stream'])
if match:
image_id = match.group(2)
return self.get(image_id)
raise BuildError(event.get('error') or event)
return BuildError('Unknown')
def get(self, name):
"""

9
tests/integration/models_images_test.py
View File

@ -28,6 +28,15 @@ class ImageCollectionTest(BaseIntegrationTest):
assert str(cm.exception) == ("Unknown instruction: "
"NOTADOCKERFILECOMMAND")
def test_build_with_multiple_success(self):
client = docker.from_env(version=TEST_API_VERSION)
image = client.images.build(tag='some-tag', fileobj=io.BytesIO(
"FROM alpine\n"
"CMD echo hello world".encode('ascii')
))
self.tmp_imgs.append(image.id)
assert client.containers.run(image) == b"hello world\n"
def test_list(self):
client = docker.from_env(version=TEST_API_VERSION)
image = client.images.pull('alpine:latest')