mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Fix dockershim panic when listing images
This commit is contained in:
parent
505ccb88da
commit
77ed72f583
@ -21,6 +21,7 @@ import (
|
||||
"net/http"
|
||||
|
||||
dockertypes "github.com/docker/docker/api/types"
|
||||
dockerfilters "github.com/docker/docker/api/types/filters"
|
||||
"github.com/docker/docker/pkg/jsonmessage"
|
||||
|
||||
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
|
||||
@ -33,8 +34,9 @@ import (
|
||||
func (ds *dockerService) ListImages(filter *runtimeapi.ImageFilter) ([]*runtimeapi.Image, error) {
|
||||
opts := dockertypes.ImageListOptions{}
|
||||
if filter != nil {
|
||||
if imgSpec := filter.GetImage(); imgSpec != nil {
|
||||
opts.Filters.Add("reference", imgSpec.Image)
|
||||
if filter.GetImage().GetImage() != "" {
|
||||
opts.Filters = dockerfilters.NewArgs()
|
||||
opts.Filters.Add("reference", filter.GetImage().GetImage())
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user