From b899c2019a6fe4b17d81d6cf0b54cd6403358874 Mon Sep 17 00:00:00 2001 From: anandhu-eng Date: Fri, 13 Dec 2024 12:07:41 +0530 Subject: [PATCH 1/2] capture docker tool --- script/get-docker/_cm.yaml | 3 ++- script/get-docker/customize.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/script/get-docker/_cm.yaml b/script/get-docker/_cm.yaml index e2f33e875..5e652cbe4 100644 --- a/script/get-docker/_cm.yaml +++ b/script/get-docker/_cm.yaml @@ -9,7 +9,8 @@ docker_input_mapping: {} input_description: {} input_mapping: {} new_env_keys: [ - "CM_DOCKER_VERSION" + "CM_DOCKER_VERSION", + "CM_DOCKER_TOOL" ] new_state_keys: [] post_deps: [] diff --git a/script/get-docker/customize.py b/script/get-docker/customize.py index 0d41346b4..ca21e7a7a 100644 --- a/script/get-docker/customize.py +++ b/script/get-docker/customize.py @@ -47,8 +47,14 @@ def detect_version(i): version = r['version'] + tool = "docker" + + if "podman" in r['string'].lower(): + tool = "podman" + + print(i['recursion_spaces'] + ' Detected version: {}'.format(version)) - return {'return': 0, 'version': version} + return {'return': 0, 'version': version, "tool":tool} def postprocess(i): @@ -60,6 +66,7 @@ def postprocess(i): return r version = r['version'] + tool = r['tool'] found_file_path = env['CM_DOCKER_BIN_WITH_PATH'] found_path = os.path.dirname(found_file_path) @@ -69,5 +76,7 @@ def postprocess(i): env['CM_DOCKER_CACHE_TAGS'] = 'version-' + version env['CM_DOCKER_VERSION'] = version + + env['CM_DOCKER_TOOL'] = tool return {'return': 0, 'version': version} From 71fd59a0a9e6f2ed5bd030a8ed9b08a92cbf7825 Mon Sep 17 00:00:00 2001 From: anandhu-eng Date: Fri, 13 Dec 2024 12:10:09 +0530 Subject: [PATCH 2/2] docker tool -> container tool --- script/get-docker/_cm.yaml | 2 +- script/get-docker/customize.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/get-docker/_cm.yaml b/script/get-docker/_cm.yaml index 5e652cbe4..881039852 100644 --- a/script/get-docker/_cm.yaml +++ b/script/get-docker/_cm.yaml @@ -10,7 +10,7 @@ input_description: {} input_mapping: {} new_env_keys: [ "CM_DOCKER_VERSION", - "CM_DOCKER_TOOL" + "CM_CONTAINER_TOOL" ] new_state_keys: [] post_deps: [] diff --git a/script/get-docker/customize.py b/script/get-docker/customize.py index ca21e7a7a..30ccf627d 100644 --- a/script/get-docker/customize.py +++ b/script/get-docker/customize.py @@ -77,6 +77,6 @@ def postprocess(i): env['CM_DOCKER_VERSION'] = version - env['CM_DOCKER_TOOL'] = tool + env['CM_CONTAINER_TOOL'] = tool return {'return': 0, 'version': version}