diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-07 17:51:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 17:51:27 +0200 |
| commit | 8014008703eef712f83e943e3d5772e6eb735bab (patch) | |
| tree | aa186a20b09e7ca2662e123f942122dc4c9eabb6 | |
| parent | 1a93857acc4ee1e5a9213e2c22f12802d84cd277 (diff) | |
| parent | 610118d9bf4ee28d50d3042d9578b3cef24fd86e (diff) | |
| download | podman-8014008703eef712f83e943e3d5772e6eb735bab.tar.gz podman-8014008703eef712f83e943e3d5772e6eb735bab.tar.bz2 podman-8014008703eef712f83e943e3d5772e6eb735bab.zip | |
Merge pull request #6878 from skorhone/fix/docker_v1_24_image_list_compatibility
Add support for Filter query parameter to list images api
| -rw-r--r-- | pkg/api/handlers/utils/images.go | 13 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 8 |
2 files changed, 19 insertions, 2 deletions
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 195e71b75..bf981b547 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -60,6 +60,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) { All bool Filters map[string][]string `schema:"filters"` Digests bool + Filter string // Docker 1.24 compatibility }{ // This is where you can override the golang default value for one of fields } @@ -76,8 +77,16 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) { err error ) - if len(query.Filters) > 0 { - for k, v := range query.Filters { + queryFilters := query.Filters + if !IsLibpodRequest(r) && len(query.Filter) > 0 { // Docker 1.24 compatibility + if queryFilters == nil { + queryFilters = make(map[string][]string) + } + queryFilters["reference"] = append(queryFilters["reference"], query.Filter) + } + + if len(queryFilters) > 0 { + for k, v := range queryFilters { filters = append(filters, fmt.Sprintf("%s=%s", k, strings.Join(v, "="))) } images, err = runtime.ImageRuntime().GetImagesWithFilters(filters) diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index 1c7ba8948..a204df65c 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -26,6 +26,14 @@ t GET libpod/images/${iid:0:12}/json 200 \ .Id=$iid \ .RepoTags[0]=$IMAGE +# Docker API V1.24 filter parameter compatibility +t GET images/json?filter=$IMAGE 200 \ + length=1 \ + .[0].Names[0]=$IMAGE + +# Negative test case +t GET images/json?filter=nonesuch 200 length=0 + # FIXME: docker API incompatibility: libpod returns 'id', docker 'sha256:id' t GET images/$iid/json 200 \ .Id=sha256:$iid \ |