From afbee30067577abe2b90463625831930ad18ed81 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 17 Mar 2022 09:05:32 +0100 Subject: [PATCH] run_sdk_container: skip fetching image if custom_image is requested In our CI most uses of run_sdk_container pass the '-C image' flag, which broke with the last change, due to unbound docker_sdk_vernum variable. Skip fetching the image when custom_image is passed. Signed-off-by: Jeremi Piotrowski --- run_sdk_container | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/run_sdk_container b/run_sdk_container index 8ddf7a9858..465451c4fd 100755 --- a/run_sdk_container +++ b/run_sdk_container @@ -108,8 +108,12 @@ if [ -z "$stat" ] ; then gpg_volumes=$(gnupg_ssh_gcloud_mount_opts) - source ci-automation/ci_automation_common.sh - docker_image_from_registry_or_buildcache "flatcar-sdk-${arch}" "${docker_sdk_vernum}" + if [ -z "$custom_image" ]; then + ( + source ci-automation/ci_automation_common.sh + docker_image_from_registry_or_buildcache "flatcar-sdk-${arch}" "${docker_sdk_vernum}" + ) + fi $docker create $tty -i \ -v /dev:/dev \