From 1d08e12f5e1173b123b229079018f83167565080 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 29 Nov 2021 16:33:55 -0800 Subject: [PATCH] When running containers, explictly use path to python3 and .py file, and --force when deleting the obsolete image --- dangerzone/container.py | 6 ++++-- dangerzone/global_common.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dangerzone/container.py b/dangerzone/container.py index 2e416cb..622106d 100644 --- a/dangerzone/container.py +++ b/dangerzone/container.py @@ -85,7 +85,8 @@ def convert(input_filename, output_filename, ocr_lang, stdout_callback): "-v", f"{pixel_dir}:/dangerzone", container_name, - "dangerzone.py", + "/usr/bin/python3", + "/usr/local/bin/dangerzone.py", "document-to-pixels", ] ret = exec_container(args, stdout_callback) @@ -110,7 +111,8 @@ def convert(input_filename, output_filename, ocr_lang, stdout_callback): "-e", f"OCR_LANGUAGE={ocr_lang}", container_name, - "dangerzone.py", + "/usr/bin/python3", + "/usr/local/bin/dangerzone.py", "pixels-to-pdf", ] ret = exec_container(args, stdout_callback) diff --git a/dangerzone/global_common.py b/dangerzone/global_common.py index d55b91f..3ab8886 100644 --- a/dangerzone/global_common.py +++ b/dangerzone/global_common.py @@ -485,7 +485,7 @@ class GlobalCommon(object): print(f"Deleting old dangerzone container image") subprocess.check_output( - [self.get_container_runtime(), "rmi", found_image_id], + [self.get_container_runtime(), "rmi", "--force", found_image_id], startupinfo=self.get_subprocess_startupinfo(), )