From e990affae6c2592413d77221fc23013f66d09a40 Mon Sep 17 00:00:00 2001 From: ANANDHU S <71482562+anandhu-eng@users.noreply.github.com> Date: Tue, 4 Mar 2025 12:52:48 +0530 Subject: [PATCH 1/3] Add support for podman --- script/get-docker/customize.py | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/script/get-docker/customize.py b/script/get-docker/customize.py index c8aaf7376..07df94923 100644 --- a/script/get-docker/customize.py +++ b/script/get-docker/customize.py @@ -12,11 +12,15 @@ def preprocess(i): recursion_spaces = i['recursion_spaces'] - file_name = 'docker.exe' if os_info['platform'] == 'windows' else 'docker' - env['FILE_NAME'] = file_name + file_name_docker = 'docker.exe' if os_info['platform'] == 'windows' else 'docker' + file_name_podman = 'podman.exe' if os_info['platform'] == 'windows' else 'podman' if 'MLC_DOCKER_BIN_WITH_PATH' not in env: - r = i['automation'].find_artifact({'file_name': file_name, + # check for docker + # if docker is not found, podman is checked + env['FILE_NAME'] = file_name_docker + env['CONTAINER_TOOL_NAME'] = "docker" + r = i['automation'].find_artifact({'file_name': file_name_docker, 'env': env, 'os_info': os_info, 'default_path_env_key': 'PATH', @@ -26,11 +30,25 @@ def preprocess(i): 'recursion_spaces': recursion_spaces}) if r['return'] > 0: if r['return'] == 16: - run_file_name = "install" - r = automation.run_native_script( - {'run_script_input': i['run_script_input'], 'env': env, 'script_name': run_file_name}) + # check for podman + # if podman is also absent, the script will try to automatically install docker in the system + env['FILE_NAME'] = file_name_podman + env['CONTAINER_TOOL_NAME'] = "podman" + r = i['automation'].find_artifact({'file_name': file_name_podman, + 'env': env, + 'os_info': os_info, + 'default_path_env_key': 'PATH', + 'detect_version': True, + 'env_path_key': 'MLC_DOCKER_BIN_WITH_PATH', + 'run_script_input': i['run_script_input'], + 'recursion_spaces': recursion_spaces}) if r['return'] > 0: - return r + if r['return'] == 16: + run_file_name = "install" + r = automation.run_native_script( + {'run_script_input': i['run_script_input'], 'env': env, 'script_name': run_file_name}) + if r['return'] > 0: + return r else: return r From cc019b503e8c251879694bb23f1ff1747e89f6c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 4 Mar 2025 07:23:04 +0000 Subject: [PATCH 2/3] [Automated Commit] Format Codebase [skip ci] --- script/get-docker/customize.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/script/get-docker/customize.py b/script/get-docker/customize.py index 07df94923..3097e343f 100644 --- a/script/get-docker/customize.py +++ b/script/get-docker/customize.py @@ -31,17 +31,18 @@ def preprocess(i): if r['return'] > 0: if r['return'] == 16: # check for podman - # if podman is also absent, the script will try to automatically install docker in the system + # if podman is also absent, the script will try to + # automatically install docker in the system env['FILE_NAME'] = file_name_podman env['CONTAINER_TOOL_NAME'] = "podman" r = i['automation'].find_artifact({'file_name': file_name_podman, - 'env': env, - 'os_info': os_info, - 'default_path_env_key': 'PATH', - 'detect_version': True, - 'env_path_key': 'MLC_DOCKER_BIN_WITH_PATH', - 'run_script_input': i['run_script_input'], - 'recursion_spaces': recursion_spaces}) + 'env': env, + 'os_info': os_info, + 'default_path_env_key': 'PATH', + 'detect_version': True, + 'env_path_key': 'MLC_DOCKER_BIN_WITH_PATH', + 'run_script_input': i['run_script_input'], + 'recursion_spaces': recursion_spaces}) if r['return'] > 0: if r['return'] == 16: run_file_name = "install" From 8fc172e4055372e3efff7b16ae63b5f43b004c62 Mon Sep 17 00:00:00 2001 From: ANANDHU S <71482562+anandhu-eng@users.noreply.github.com> Date: Tue, 4 Mar 2025 12:53:28 +0530 Subject: [PATCH 3/3] Container tool name made dynamic --- script/get-docker/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/get-docker/run.sh b/script/get-docker/run.sh index f7f946a7f..f78518097 100644 --- a/script/get-docker/run.sh +++ b/script/get-docker/run.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker --version > tmp-ver.out +${CONTAINER_TOOL_NAME} --version > tmp-ver.out test $? -eq 0 || exit 1