Merge pull request from matejvasek/fix-get-multiple-imgs-compat

fix: compat API "images/get" for multiple images
This commit is contained in:
OpenShift Merge Robot
2021-05-08 06:20:19 -04:00
committed by GitHub
2 changed files with 4 additions and 12 deletions
pkg/api/handlers/compat
test/apiv2

@ -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

@ -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