mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 23:15:14 +00:00
Merge pull request #92444 from dims/additional-check-for-containerd-for-better-loading-images
Additional test for loading images with containerd
This commit is contained in:
commit
de491f11b1
@ -379,7 +379,7 @@ function try-load-docker-image {
|
||||
|
||||
if [[ "${CONTAINER_RUNTIME_NAME:-}" == "docker" ]]; then
|
||||
load_image_command=${LOAD_IMAGE_COMMAND:-docker load -i}
|
||||
elif [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" ]]; then
|
||||
elif [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" || "${CONTAINERD_TEST:-}" == "containerd" ]]; then
|
||||
load_image_command=${LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
|
||||
else
|
||||
load_image_command="${LOAD_IMAGE_COMMAND:-}"
|
||||
|
Loading…
Reference in New Issue
Block a user