From 1374e2be741f11137347f8493f89868dc8c2a76d Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Sun, 25 Jun 2023 03:43:45 +0200 Subject: [PATCH] wrapper/docker: fix logging of docker build failures --- wrapper/docker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wrapper/docker.py b/wrapper/docker.py index 52da4c1..13c0bde 100644 --- a/wrapper/docker.py +++ b/wrapper/docker.py @@ -39,14 +39,15 @@ class DockerWrapper(Wrapper): tag, ] + (['-q'] if not config.runtime.verbose else []) logging.debug('Running docker cmd: ' + ' '.join(cmd)) + mute_docker = not config.runtime.verbose result = subprocess.run( cmd, cwd=script_path, - stdout=(sys.stdout if config.runtime.verbose else subprocess.PIPE), - stderr=(sys.stderr if config.runtime.verbose else subprocess.PIPE), + capture_output=mute_docker, ) if result.returncode != 0: - logging.fatal('Failed to build docker image:\n' + result.stderr.decode()) + error_msg = ('\n' + result.stderr.decode() + '\n') if mute_docker else '' + logging.fatal(f'Docker error: {error_msg}Failed to build docker image: see errors above: ^^^^') exit(1) else: # Check if the image for the version already exists