container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-21 01:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compat API "images/get" for multiple images

Browse source 
Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2021-05-07 20:35:03 +02:00
parent 0ce6a65b39
commit c8deab8296
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/api/handlers/compat/images.go
View file

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

10
test/apiv2/10-images.at
View file

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