From 4fd7fd19186bea74f50db8ba3f9c56bbc58ac41f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 4 Feb 2025 07:56:37 -0500 Subject: [PATCH] Honor RAMALAMA_IMAGE if set Currently on my cuda laptop, if I set RAMALAMA_IMAGE to something, ramalama ignores it and forces cuda image. Signed-off-by: Daniel J Walsh --- ramalama/common.py | 3 ++- ramalama/model.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ramalama/common.py b/ramalama/common.py index 50c1db2f..2c562a84 100644 --- a/ramalama/common.py +++ b/ramalama/common.py @@ -23,6 +23,7 @@ MNT_FILE = f"{MNT_DIR}/model.file" HTTP_RANGE_NOT_SATISFIABLE = 416 +DEFAULT_IMAGE="quay.io/ramalama/ramalama" def container_manager(): engine = os.getenv("RAMALAMA_CONTAINER_ENGINE") @@ -156,7 +157,7 @@ def default_image(): if image: return image - return "quay.io/ramalama/ramalama" + return DEFAULT_IMAGE def genname(): diff --git a/ramalama/model.py b/ramalama/model.py index 24c27e52..29d7ad6a 100644 --- a/ramalama/model.py +++ b/ramalama/model.py @@ -4,7 +4,7 @@ from ramalama.common import ( container_manager, - default_image, + DEFAULT_IMAGE, exec_cmd, genname, run_cmd, @@ -106,7 +106,7 @@ def attempt_to_use_versioned(self, conman, image, vers, args): return False def _image(self, args): - if args.image != default_image(): + if args.image != DEFAULT_IMAGE: return args.image env_vars = get_env_vars()