containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5482 from baude/removeimagefilter 

remove imagefilter for varlink remote client
This commit is contained in:
OpenShift Merge Robot 2020-03-12 15:49:08 -04:00 committed by GitHub
parent 9c7481dbd1 3aa58ccd0a
commit ac6c8fb683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/images.go
View File

@ -155,7 +155,7 @@ func imagesCmd(c *cliconfig.ImagesValues) error {
return errors.New("can not specify an image and a filter") return errors.New("can not specify an image and a filter")
} }
filters := c.Filter filters := c.Filter
if len(filters) < 1 { if len(filters) < 1 && len(image) > 0 {
filters = append(filters, fmt.Sprintf("reference=%s", image)) filters = append(filters, fmt.Sprintf("reference=%s", image))
} }

5
pkg/adapter/runtime_remote.go
View File

@ -201,8 +201,11 @@ func (r *LocalRuntime) GetRWImages() ([]*ContainerImage, error) {
} }
func (r *LocalRuntime) GetFilteredImages(filters []string, rwOnly bool) ([]*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 var newImages []*ContainerImage
images, err := iopodman.ListImagesWithFilters().Call(r.Conn, filters) images, err := iopodman.ListImages().Call(r.Conn)
if err != nil { if err != nil {
return nil, err return nil, err
} }