diff options
| author | Matej Vasek <mvasek@redhat.com> | 2021-05-07 20:35:03 +0200 |
|---|---|---|
| committer | Matej Vasek <mvasek@redhat.com> | 2021-05-07 20:35:03 +0200 |
| commit | c8deab8296ea1267d78a8ada45c3cfdc45fa207a (patch) | |
| tree | f759785789b72991146a80592856fc04603b4893 | |
| parent | 0ce6a65b3961465593470c3457d75b0a846c8d98 (diff) | |
| download | podman-c8deab8296ea1267d78a8ada45c3cfdc45fa207a.tar.gz podman-c8deab8296ea1267d78a8ada45c3cfdc45fa207a.tar.bz2 podman-c8deab8296ea1267d78a8ada45c3cfdc45fa207a.zip | |
fix: compat API "images/get" for multiple images
Signed-off-by: Matej Vasek <mvasek@redhat.com>
| -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 4b7a2a71c..dc0cb1237 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -455,10 +455,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") @@ -474,7 +470,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 |