diff --git a/script/get-docker/_cm.yaml b/script/get-docker/_cm.yaml index e2f33e875..881039852 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_CONTAINER_TOOL" ] new_state_keys: [] post_deps: [] diff --git a/script/get-docker/customize.py b/script/get-docker/customize.py index 0d41346b4..30ccf627d 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_CONTAINER_TOOL'] = tool return {'return': 0, 'version': version}