diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-08 06:20:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 06:20:19 -0400 |
| commit | 54bed1025d07bc5f77ee4e1e7f942157e211ec0a (patch) | |
| tree | 4a02f20824d033c78c7fc9cd05b3ca4d6a49b3d4 | |
| parent | 141d3f1ac33de5c9642cc089fbd526d0ab1f5250 (diff) | |
| parent | c8deab8296ea1267d78a8ada45c3cfdc45fa207a (diff) | |
| download | podman-54bed1025d07bc5f77ee4e1e7f942157e211ec0a.tar.gz podman-54bed1025d07bc5f77ee4e1e7f942157e211ec0a.tar.bz2 podman-54bed1025d07bc5f77ee4e1e7f942157e211ec0a.zip | |
Merge pull request #10265 from matejvasek/fix-get-multiple-imgs-compat
fix: compat API "images/get" for multiple images
| -rw-r--r-- | pkg/api/handlers/compat/images.go | 6 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index cd03f5fe0..3f4320efa 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -459,10 +459,6 @@ func ExportImages(w http.ResponseWriter, r *http.Request) { utils.Error(w, "Something went wrong.", http.StatusBadRequest, fmt.Errorf("no images to download")) return } - if len(query.Names) > 1 { - utils.Error(w, "Something went wrong.", http.StatusNotImplemented, fmt.Errorf("getting multiple image is not supported yet")) - return - } images := query.Names tmpfile, err := ioutil.TempFile("", "api.tar") @@ -478,7 +474,7 @@ func ExportImages(w http.ResponseWriter, r *http.Request) { imageEngine := abi.ImageEngine{Libpod: runtime} - saveOptions := entities.ImageSaveOptions{Format: "docker-archive", Output: tmpfile.Name()} + saveOptions := entities.ImageSaveOptions{Format: "docker-archive", Output: tmpfile.Name(), MultiImageArchive: true} if err := imageEngine.Save(r.Context(), images[0], images[1:], saveOptions); err != nil { utils.InternalServerError(w, err) return diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index 53702fa0a..037a4c01f 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -143,12 +143,8 @@ t DELETE libpod/images/test1:latest 200 t GET "images/get?names=alpine" 200 '[POSIX tar archive]' podman pull busybox -#t GET "images/get?names=alpine&names=busybox" 200 '[POSIX tar archive]' -#img_cnt=$(tar xf "$WORKDIR/curl.result.out" manifest.json -O | jq "length") -#is "$img_cnt" 2 "number of images in tar archive" -# TODO getting multiple images is not supported yet -# once it is supported replace the test below by the tests above -t GET "images/get?names=alpine&names=busybox" 501 \ - .cause="getting multiple image is not supported yet" +t GET "images/get?names=alpine&names=busybox" 200 '[POSIX tar archive]' +img_cnt=$(tar xf "$WORKDIR/curl.result.out" manifest.json -O | jq "length") +is "$img_cnt" 2 "number of images in tar archive" # vim: filetype=sh |