ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 11:51:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[cloud] module docker_image: print output on failure (#20757)

Browse source 
Fixes https://github.com/ansible/ansible-modules-core/issues/5161

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
This commit is contained in:
Tomas Tomecek 2017-02-16 15:47:18 +01:00 • committed by Ryan Brown
parent f42ffe6de3
commit 30026cfb84
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/cloud/docker/docker_image.py
View file

@ -508,6 +508,7 @@ class ImageManager(DockerBaseClass):
dockerfile=self.dockerfile, dockerfile=self.dockerfile,
decode=True decode=True
) )
build_output = []
if self.tag: if self.tag:
params['tag'] = "%s:%s" % (self.name, self.tag) params['tag'] = "%s:%s" % (self.name, self.tag)
if self.container_limits: if self.container_limits:
@ -521,14 +522,20 @@ class ImageManager(DockerBaseClass):
for line in self.client.build(**params): for line in self.client.build(**params):
# line = json.loads(line) # line = json.loads(line)
self.log(line, pretty_print=True) self.log(line, pretty_print=True)
if "stream" in line:
build_output.append(line["stream"])
if line.get('error'): if line.get('error'):
if line.get('errorDetail'): if line.get('errorDetail'):
errorDetail = line.get('errorDetail') errorDetail = line.get('errorDetail')
self.fail("Error building %s - code: %s message: %s" % (self.name, self.fail(
errorDetail.get('code'), "Error building %s - code: %s, message: %s, logs: %s" % (
errorDetail.get('message'))) self.name,
errorDetail.get('code'),
errorDetail.get('message'),
build_output))
else: else:
self.fail("Error building %s - %s" % (self.name, line.get('error'))) self.fail("Error building %s - message: %s, logs: %s" % (
self.name, line.get('error'), build_output))
return self.client.find_image(name=self.name, tag=self.tag) return self.client.find_image(name=self.name, tag=self.tag)
def load_image(self): def load_image(self):