diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 05a4e6c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "share/container"]
- path = share/container
- url = git@github.com:firstlookmedia/dangerzone-converter.git
diff --git a/BUILD.md b/BUILD.md
index 6170dd3..3e0e105 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -1,12 +1,5 @@
# Development environment
-After cloning this git repo, make sure to checkout the git submodules.
-
-```
-git submodule init
-git submodule update
-```
-
## Debian/Ubuntu
Install dependencies:
diff --git a/RELEASE.md b/RELEASE.md
index d6b118a..360eaeb 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -18,12 +18,10 @@ git fetch
git tag -v v$VERSION
```
-If the tag verifies successfully, check it out, and also its submodules:
+If the tag verifies successfully and check it out:
```
git checkout v$VERSION
-git submodule init
-git submodule update
```
## macOS release
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()
diff --git a/install/pyinstaller/pyinstaller.spec b/install/pyinstaller/pyinstaller.spec
index e4f223c..41c6629 100644
--- a/install/pyinstaller/pyinstaller.spec
+++ b/install/pyinstaller/pyinstaller.spec
@@ -16,7 +16,7 @@ sys.path.insert(0, root)
import dangerzone
version = dangerzone.dangerzone_version
-print("Flock Agent version: {}".format(version))
+print("Dangerzone version: {}".format(version))
if p == "Darwin":
datas = [("../../share", "share"), ("../macos/../macos/document.icns", ".")]
diff --git a/install/windows/Dangerzone.wxs b/install/windows/Dangerzone.wxs
index 26c6310..af01865 100644
--- a/install/windows/Dangerzone.wxs
+++ b/install/windows/Dangerzone.wxs
@@ -40,11 +40,7 @@
-
-
-
-
-
+
@@ -202,23 +198,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/setup.py b/setup.py
index cb51b09..3fe975d 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,6 @@ setuptools.setup(
["install/linux/media.firstlook.dangerzone.png"],
),
("share/dangerzone", file_list("share")),
- ("share/dangerzone/container", file_list("share/container")),
- ("share/dangerzone/container/scripts", file_list("share/container/scripts")),
],
classifiers=[
"Programming Language :: Python",
diff --git a/share/container b/share/container
deleted file mode 160000
index 9de7f4c..0000000
--- a/share/container
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9de7f4cd81e71df0dcea4c4f9a76bee6a27cb234