diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py index 01a968f..2697986 100644 --- a/dangerzone/tasks.py +++ b/dangerzone/tasks.py @@ -61,7 +61,7 @@ class PullImageTask(TaskBase): def run(self): self.update_label.emit("Pulling container image") self.update_details.emit("") - args = ["pull", "debian:buster"] + args = ["pull", "flmcode/dangerzone"] returncode, _ = self.exec_container(args, watch="stderr") if returncode != 0: @@ -71,26 +71,6 @@ class PullImageTask(TaskBase): self.task_finished.emit() -class BuildContainerTask(TaskBase): - def __init__(self, global_common, common): - super(BuildContainerTask, self).__init__() - self.global_common = global_common - self.common = common - - def run(self): - container_path = self.global_common.get_resource_path("container") - self.update_label.emit("Building container (this might take a long time)") - self.update_details.emit("") - args = ["build", "-t", "dangerzone", container_path] - returncode, _ = self.exec_container(args) - - if returncode != 0: - self.task_failed.emit(f"Return code: {returncode}") - return - - self.task_finished.emit() - - class ConvertToPixels(TaskBase): def __init__(self, global_common, common): super(ConvertToPixels, self).__init__() @@ -111,7 +91,7 @@ class ConvertToPixels(TaskBase): f"{self.common.document_filename}:/tmp/input_file", "-v", f"{self.common.pixel_dir.name}:/dangerzone", - "dangerzone", + "flmcode/dangerzone", "document-to-pixels", ] returncode, output = self.exec_container(args) @@ -220,7 +200,7 @@ class ConvertToPDF(TaskBase): f"{self.common.safe_dir.name}:/safezone", ] + envs - + ["dangerzone", "pixels-to-pdf",] + + ["flmcode/dangerzone", "pixels-to-pdf",] ) returncode, output = self.exec_container(args) @@ -229,4 +209,3 @@ class ConvertToPDF(TaskBase): return self.task_finished.emit() - diff --git a/dangerzone/tasks_widget.py b/dangerzone/tasks_widget.py index b70363b..a8436ac 100644 --- a/dangerzone/tasks_widget.py +++ b/dangerzone/tasks_widget.py @@ -5,7 +5,7 @@ import platform import subprocess from PyQt5 import QtCore, QtGui, QtWidgets -from .tasks import PullImageTask, BuildContainerTask, ConvertToPixels, ConvertToPDF +from .tasks import PullImageTask, ConvertToPixels, ConvertToPDF class TasksWidget(QtWidgets.QWidget): @@ -59,7 +59,7 @@ class TasksWidget(QtWidgets.QWidget): def start(self): if self.global_common.settings.get("update_container"): - self.tasks += [PullImageTask, BuildContainerTask] + self.tasks += [PullImageTask] self.tasks += [ConvertToPixels, ConvertToPDF] self.next_task()