From e3069e9e05d7545444ef299b44e9d681e38296fa Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 13 Feb 2020 15:55:28 -0800 Subject: [PATCH] Fail early if container pull or build fail --- dangerzone/tasks.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py index eb6f38c..c246f39 100644 --- a/dangerzone/tasks.py +++ b/dangerzone/tasks.py @@ -61,7 +61,12 @@ class PullImageTask(TaskBase): self.update_label.emit("Pulling container image") self.update_details.emit("") args = ["pull", "ubuntu:20.04"] - self.exec_container(args, watch="stderr") + returncode, _ = self.exec_container(args, watch="stderr") + + if returncode != 0: + self.task_failed.emit(f"Return code: {returncode}") + return + self.task_finished.emit() @@ -75,7 +80,12 @@ class BuildContainerTask(TaskBase): self.update_label.emit("Building container") self.update_details.emit("") args = ["build", "-t", "dangerzone", container_path] - self.exec_container(args) + returncode, _ = self.exec_container(args) + + if returncode != 0: + self.task_failed.emit(f"Return code: {returncode}") + return + self.task_finished.emit()