almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Use container from dockerhub instead of building it

Browse source
This commit is contained in:
Micah Lee 2020-02-27 15:18:19 -08:00
parent 514cd36328
commit 389f9db421
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dangerzone/tasks.py
View file

@ -61,7 +61,7 @@ class PullImageTask(TaskBase):
def run(self): def run(self):
self.update_label.emit("Pulling container image") self.update_label.emit("Pulling container image")
self.update_details.emit("") self.update_details.emit("")
args = ["pull", "debian:buster"] args = ["pull", "flmcode/dangerzone"]
returncode, _ = self.exec_container(args, watch="stderr") returncode, _ = self.exec_container(args, watch="stderr")
if returncode != 0: if returncode != 0:
@ -71,26 +71,6 @@ class PullImageTask(TaskBase):
self.task_finished.emit() 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): class ConvertToPixels(TaskBase):
def __init__(self, global_common, common): def __init__(self, global_common, common):
super(ConvertToPixels, self).__init__() super(ConvertToPixels, self).__init__()
@ -111,7 +91,7 @@ class ConvertToPixels(TaskBase):
f"{self.common.document_filename}:/tmp/input_file", f"{self.common.document_filename}:/tmp/input_file",
"-v", "-v",
f"{self.common.pixel_dir.name}:/dangerzone", f"{self.common.pixel_dir.name}:/dangerzone",
"dangerzone", "flmcode/dangerzone",
"document-to-pixels", "document-to-pixels",
] ]
returncode, output = self.exec_container(args) returncode, output = self.exec_container(args)
@ -220,7 +200,7 @@ class ConvertToPDF(TaskBase):
f"{self.common.safe_dir.name}:/safezone", f"{self.common.safe_dir.name}:/safezone",
] ]
+ envs + envs
+ ["dangerzone", "pixels-to-pdf",] + ["flmcode/dangerzone", "pixels-to-pdf",]
) )
returncode, output = self.exec_container(args) returncode, output = self.exec_container(args)
@ -229,4 +209,3 @@ class ConvertToPDF(TaskBase):
return return
self.task_finished.emit() self.task_finished.emit()

4
dangerzone/tasks_widget.py
View file

@ -5,7 +5,7 @@ import platform
import subprocess import subprocess
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from .tasks import PullImageTask, BuildContainerTask, ConvertToPixels, ConvertToPDF from .tasks import PullImageTask, ConvertToPixels, ConvertToPDF
class TasksWidget(QtWidgets.QWidget): class TasksWidget(QtWidgets.QWidget):
@ -59,7 +59,7 @@ class TasksWidget(QtWidgets.QWidget):
def start(self): def start(self):
if self.global_common.settings.get("update_container"): if self.global_common.settings.get("update_container"):
self.tasks += [PullImageTask, BuildContainerTask] self.tasks += [PullImageTask]
self.tasks += [ConvertToPixels, ConvertToPDF] self.tasks += [ConvertToPixels, ConvertToPDF]
self.next_task() self.next_task()