From 459efe0ce3488665ae1a3fca7ed971e7ffedfbc8 Mon Sep 17 00:00:00 2001 From: kratman Date: Thu, 11 Apr 2024 09:13:43 -0400 Subject: [PATCH 1/3] Fix docker command for windows --- ionwizard/container_wizard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ionwizard/container_wizard.py b/ionwizard/container_wizard.py index a36f733..f5337d6 100644 --- a/ionwizard/container_wizard.py +++ b/ionwizard/container_wizard.py @@ -30,8 +30,7 @@ def fetch_image(lib_name, web_address, key, location): def load_image(product, location): zip_name = IonWorksImageWizard.get_zip_name(product) err = subprocess.call( - [f"docker load < {os.path.join(location, zip_name)}"], shell=True - ) + ["docker", "load", "-i", os.path.join(location, zip_name)]) if err != 0: raise RuntimeError(f"\nDocker loading failed for {product}.\n") @@ -93,6 +92,7 @@ def install_from(config): @staticmethod def make_container(config): with TemporaryDirectory() as image_dir: + image_dir = "" addr = IonWorksImageWizard.get_address(config["version"], config["product"]) IonWorksImageWizard.fetch_image( config["product"], addr, f"license:{config['key']}", image_dir From e95f11a9999f49c4175b5c9782365cea5fe0d399 Mon Sep 17 00:00:00 2001 From: kratman Date: Thu, 11 Apr 2024 09:15:06 -0400 Subject: [PATCH 2/3] Remove debug line --- ionwizard/container_wizard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ionwizard/container_wizard.py b/ionwizard/container_wizard.py index f5337d6..9bbaf13 100644 --- a/ionwizard/container_wizard.py +++ b/ionwizard/container_wizard.py @@ -92,7 +92,6 @@ def install_from(config): @staticmethod def make_container(config): with TemporaryDirectory() as image_dir: - image_dir = "" addr = IonWorksImageWizard.get_address(config["version"], config["product"]) IonWorksImageWizard.fetch_image( config["product"], addr, f"license:{config['key']}", image_dir From 24714b2612a7091782862cec68086ebaf7eafb82 Mon Sep 17 00:00:00 2001 From: kratman Date: Thu, 11 Apr 2024 09:15:36 -0400 Subject: [PATCH 3/3] Pre-commit --- ionwizard/container_wizard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ionwizard/container_wizard.py b/ionwizard/container_wizard.py index 9bbaf13..c60eada 100644 --- a/ionwizard/container_wizard.py +++ b/ionwizard/container_wizard.py @@ -30,7 +30,8 @@ def fetch_image(lib_name, web_address, key, location): def load_image(product, location): zip_name = IonWorksImageWizard.get_zip_name(product) err = subprocess.call( - ["docker", "load", "-i", os.path.join(location, zip_name)]) + ["docker", "load", "-i", os.path.join(location, zip_name)] + ) if err != 0: raise RuntimeError(f"\nDocker loading failed for {product}.\n")