Skip to content

Commit 77a6d2c

Browse files
committed
resolving docker build issue
1 parent 8cfe4a1 commit 77a6d2c

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/rocker/core.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def get_docker_client():
136136
def docker_build(docker_client = None, output_callback = None, **kwargs):
137137
image_id = None
138138
build_success = False
139-
build_output = []
139+
error_message = []
140140

141141
if not docker_client:
142142
docker_client = get_docker_client()
@@ -149,17 +149,20 @@ def docker_build(docker_client = None, output_callback = None, **kwargs):
149149
continue
150150
if output_callback is not None:
151151
output_callback(output)
152-
build_output.append(output)
153152

154153
match = re.match(r'Successfully built ([a-z0-9]{12})', output)
155154
if match:
156155
image_id = match.group(1)
157156
build_success = True
157+
elif "error" in output.lower():
158+
error_message.append(output)
159+
158160

159161
if build_success:
160162
return image_id
161163
else:
162-
raise Exception("Build failed: "+"\n".join(build_output))
164+
error_msg = "\n".join(error_message)
165+
raise Exception(f"Build failed:\n{error_msg}")
163166

164167

165168
class SIGWINCHPassthrough(object):

0 commit comments

Comments
 (0)