From 2de2b6dca517e4107a8e98d15743a07987dcd6cd Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 29 Nov 2021 15:30:21 -0800 Subject: [PATCH] Rename dangerzone-converter to container --- .gitignore | 4 ++-- {dangerzone-converter => container}/Dockerfile | 0 .../dangerzone.py | 0 .../document-to-pixels | 0 .../pixels-to-pdf | 0 dangerzone/global_common.py | 8 +++----- install/linux/build-image.sh | 12 ++++++------ install/macos/build-image.sh | 12 ++++++------ install/windows/build-image.py | 16 ++++++++-------- 9 files changed, 25 insertions(+), 27 deletions(-) rename {dangerzone-converter => container}/Dockerfile (100%) rename {dangerzone-converter => container}/dangerzone.py (100%) rename {dangerzone-converter => container}/document-to-pixels (100%) rename {dangerzone-converter => container}/pixels-to-pdf (100%) diff --git a/.gitignore b/.gitignore index 2f2dc31..6620ae7 100644 --- a/.gitignore +++ b/.gitignore @@ -134,6 +134,6 @@ deb_dist .DS_Store install/windows/Dangerzone.wxs test_docs/sample-safe.pdf -share/dangerzone-converter.tar -share/dangerzone-converter.tar.gz +share/container.tar +share/container.tar.gz share/image-id.txt diff --git a/dangerzone-converter/Dockerfile b/container/Dockerfile similarity index 100% rename from dangerzone-converter/Dockerfile rename to container/Dockerfile diff --git a/dangerzone-converter/dangerzone.py b/container/dangerzone.py similarity index 100% rename from dangerzone-converter/dangerzone.py rename to container/dangerzone.py diff --git a/dangerzone-converter/document-to-pixels b/container/document-to-pixels similarity index 100% rename from dangerzone-converter/document-to-pixels rename to container/document-to-pixels diff --git a/dangerzone-converter/pixels-to-pdf b/container/pixels-to-pdf similarity index 100% rename from dangerzone-converter/pixels-to-pdf rename to container/pixels-to-pdf diff --git a/dangerzone/global_common.py b/dangerzone/global_common.py index 438dd56..d55b91f 100644 --- a/dangerzone/global_common.py +++ b/dangerzone/global_common.py @@ -25,7 +25,7 @@ class GlobalCommon(object): with open(self.get_resource_path("version.txt")) as f: self.version = f.read().strip() except FileNotFoundError: - # In dev mode, in Windows, get_resource_path doesn't work properly for dangerzone-container, but luckily + # In dev mode, in Windows, get_resource_path doesn't work properly for the container, but luckily # it doesn't need to know the version self.version = "unknown" @@ -435,10 +435,8 @@ class GlobalCommon(object): startupinfo=self.get_subprocess_startupinfo(), ) - chunk_size = 1024 - compressed_container_path = self.get_resource_path( - "dangerzone-converter.tar.gz" - ) + chunk_size = 10240 + compressed_container_path = self.get_resource_path("container.tar.gz") with gzip.open(compressed_container_path) as f: while True: chunk = f.read(chunk_size) diff --git a/install/linux/build-image.sh b/install/linux/build-image.sh index 5617564..7689b6c 100755 --- a/install/linux/build-image.sh +++ b/install/linux/build-image.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo "Building dangerzone-converter image" -podman build dangerzone-converter --tag dangerzone.rocks/dangerzone +echo "Building container image" +podman build container --tag dangerzone.rocks/dangerzone -echo "Saving dangerzone-converter image" -podman save dangerzone.rocks/dangerzone -o share/dangerzone-converter.tar +echo "Saving container image" +podman save dangerzone.rocks/dangerzone -o share/container.tar -echo "Compressing dangerzone-converter image" -gzip -f share/dangerzone-converter.tar +echo "Compressing container image" +gzip -f share/container.tar echo "Looking up the image id" podman image ls dangerzone.rocks/dangerzone | grep "dangerzone.rocks/dangerzone" | tr -s ' ' | cut -d' ' -f3 > share/image-id.txt diff --git a/install/macos/build-image.sh b/install/macos/build-image.sh index 61291b5..17d40db 100755 --- a/install/macos/build-image.sh +++ b/install/macos/build-image.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo "Building dangerzone-converter image" -docker build dangerzone-converter --tag dangerzone.rocks/dangerzone +echo "Building container image" +docker build container --tag dangerzone.rocks/dangerzone -echo "Saving dangerzone-converter image" -docker save dangerzone.rocks/dangerzone -o share/dangerzone-converter.tar +echo "Saving container image" +docker save dangerzone.rocks/dangerzone -o share/container.tar -echo "Compressing dangerzone-converter image" -gzip -f share/dangerzone-converter.tar +echo "Compressing container image" +gzip -f share/container.tar echo "Looking up the image id" docker image ls dangerzone.rocks/dangerzone | grep "dangerzone.rocks/dangerzone" | tr -s ' ' | cut -d' ' -f3 > share/image-id.txt diff --git a/install/windows/build-image.py b/install/windows/build-image.py index 1327057..1531cd0 100644 --- a/install/windows/build-image.py +++ b/install/windows/build-image.py @@ -4,32 +4,32 @@ import os def main(): - print("Building dangerzone-converter image") + print("Building container image") subprocess.run( [ "docker", "build", - "dangerzone-converter", + "container", "--tag", "dangerzone.rocks/dangerzone", ] ) - print("Saving dangerzone-converter image") + print("Saving container image") subprocess.run( [ "docker", "save", "dangerzone.rocks/dangerzone", "-o", - "share/dangerzone-converter.tar", + "share/container.tar", ] ) - print("Compressing dangerzone-converter image") + print("Compressing container image") chunk_size = 1024 - with open("share/dangerzone-converter.tar", "rb") as f: - with gzip.open("share/dangerzone-converter.tar.gz", "wb") as gzip_f: + with open("share/container.tar", "rb") as f: + with gzip.open("share/container.tar.gz", "wb") as gzip_f: while True: chunk = f.read(chunk_size) if len(chunk) > 0: @@ -37,7 +37,7 @@ def main(): else: break - os.remove("share/dangerzone-converter.tar") + os.remove("share/container.tar") print("Looking up the image id") image_id = subprocess.check_output(