From 3403ba4923255d6d69aae4d7495dbbd78884510e Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 18 Oct 2020 23:12:23 +0200 Subject: [PATCH] kas-container: Drop container image prefix The current default causes spurious pulls even when the image is already locally available, at least with podman 2.0.x. Looking through podman how-tos, none mentions that this prefix is required, and the image_default_transport in containers.con is generally "docker://". So it's safe to drop it for better default behavior. If a custom local setup deviate, users can still override KAS_CONTAINER_IMAGE_PATH, prepending what is desired. Signed-off-by: Jan Kiszka --- kas-container | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kas-container b/kas-container index 1733288..e0c7190 100755 --- a/kas-container +++ b/kas-container @@ -66,14 +66,12 @@ trace() KAS_IMAGE_VERSION_DEFAULT="2.2" KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas" KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas" -KAS_CONTAINER_IMAGE_PREFIX_DEFAULT="" set_container_image_var() { KAS_IMAGE_VERSION="${KAS_IMAGE_VERSION:-${KAS_IMAGE_VERSION_DEFAULT}}" KAS_CONTAINER_IMAGE_NAME="${KAS_CONTAINER_IMAGE_NAME:-${KAS_CONTAINER_IMAGE_NAME_DEFAULT}}" KAS_CONTAINER_IMAGE_PATH="${KAS_CONTAINER_IMAGE_PATH:-${KAS_CONTAINER_IMAGE_PATH_DEFAULT}}" - KAS_CONTAINER_IMAGE_PREFIX="${KAS_CONTAINER_IMAGE_PREFIX:-${KAS_CONTAINER_IMAGE_PREFIX_DEFAULT}}" - KAS_CONTAINER_IMAGE="${KAS_CONTAINER_IMAGE_PREFIX}${KAS_CONTAINER_IMAGE_PATH}/${KAS_CONTAINER_IMAGE_NAME}:${KAS_IMAGE_VERSION}" + KAS_CONTAINER_IMAGE="${KAS_CONTAINER_IMAGE_PATH}/${KAS_CONTAINER_IMAGE_NAME}:${KAS_IMAGE_VERSION}" } if [ -n "${KAS_WORK_DIR}" ]; then @@ -101,7 +99,6 @@ docker) ;; podman) KAS_CONTAINER_COMMAND="podman" - KAS_CONTAINER_IMAGE_PREFIX_DEFAULT="docker://" KAS_RUNTIME_ARGS="--userns=keep-id --security-opt label=disable" ;; *)