diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-12 15:49:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 15:49:08 -0400 |
| commit | ac6c8fb6836d4830199f4504724767b275feea42 (patch) | |
| tree | d9afa9fbda038a8cea16522ae50737450703c451 | |
| parent | 9c7481dbd1e6ea7e20ee03c85d4710c42ba81c6e (diff) | |
| parent | 3aa58ccd0a622d539b24df2d8fd68fe0b0d6d208 (diff) | |
| download | podman-ac6c8fb6836d4830199f4504724767b275feea42.tar.gz podman-ac6c8fb6836d4830199f4504724767b275feea42.tar.bz2 podman-ac6c8fb6836d4830199f4504724767b275feea42.zip | |
Merge pull request #5482 from baude/removeimagefilter
remove imagefilter for varlink remote client
| -rw-r--r-- | cmd/podman/images.go | 2 | ||||
| -rw-r--r-- | pkg/adapter/runtime_remote.go | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd/podman/images.go b/cmd/podman/images.go index de61690ae..41790a5aa 100644 --- a/cmd/podman/images.go +++ b/cmd/podman/images.go @@ -155,7 +155,7 @@ func imagesCmd(c *cliconfig.ImagesValues) error { return errors.New("can not specify an image and a filter") } filters := c.Filter - if len(filters) < 1 { + if len(filters) < 1 && len(image) > 0 { filters = append(filters, fmt.Sprintf("reference=%s", image)) } diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go index 220d4cf75..d87de481c 100644 --- a/pkg/adapter/runtime_remote.go +++ b/pkg/adapter/runtime_remote.go @@ -201,8 +201,11 @@ func (r *LocalRuntime) GetRWImages() ([]*ContainerImage, error) { } func (r *LocalRuntime) GetFilteredImages(filters []string, rwOnly bool) ([]*ContainerImage, error) { + if len(filters) > 0 { + return nil, errors.Wrap(define.ErrNotImplemented, "filtering images is not supported on the remote client") + } var newImages []*ContainerImage - images, err := iopodman.ListImagesWithFilters().Call(r.Conn, filters) + images, err := iopodman.ListImages().Call(r.Conn) if err != nil { return nil, err } |