diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-20 17:29:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 17:29:31 -0500 |
| commit | 993c072029fb2c3938d3685ca7e38b5eab29c400 (patch) | |
| tree | f694f5295873b3a6cf2cfd9531a985fc5239a248 | |
| parent | ca62a39985bf9d1835e8a9718d7f6c02f1f0607c (diff) | |
| parent | 1c0fdba4f2cfbabadcbd16933882dbb2fb2e77f8 (diff) | |
| download | podman-993c072029fb2c3938d3685ca7e38b5eab29c400.tar.gz podman-993c072029fb2c3938d3685ca7e38b5eab29c400.tar.bz2 podman-993c072029fb2c3938d3685ca7e38b5eab29c400.zip | |
Merge pull request #12942 from flouthoc/compat-load-tar-with-multiple-images
compat: `images/load` must be able to load tar with multiple images
| -rw-r--r-- | pkg/api/handlers/compat/images.go | 6 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index 23a9b12a3..401a7ec1b 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -503,15 +503,15 @@ func LoadImages(w http.ResponseWriter, r *http.Request) { return } - if len(loadReport.Names) != 1 { - utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Errorf("%d instead of 1 were loaded", len(loadReport.Names))) + if len(loadReport.Names) < 1 { + utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Errorf("one or more images are required")) return } utils.WriteResponse(w, http.StatusOK, struct { Stream string `json:"stream"` }{ - Stream: fmt.Sprintf("Loaded image: %s\n", loadReport.Names[0]), + Stream: fmt.Sprintf("Loaded image: %s", strings.Join(loadReport.Names, ",")), }) } diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index 36c2fc6aa..673858a3c 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -197,6 +197,14 @@ t POST "build?dockerfile=containerfile" $CONTAINERFILE_TAR 200 \ t POST libpod/images/prune 200 t POST libpod/images/prune 200 length=0 [] +# compat api must allow loading tar which contain multiple images +podman pull quay.io/libpod/alpine:latest quay.io/libpod/busybox:latest +podman save -o ${TMPD}/test.tar quay.io/libpod/alpine:latest quay.io/libpod/busybox:latest +t POST "images/load" ${TMPD}/test.tar 200 \ + .stream="Loaded image: quay.io/libpod/busybox:latest,quay.io/libpod/alpine:latest" +t GET libpod/images/quay.io/libpod/alpine:latest/exists 204 +t GET libpod/images/quay.io/libpod/busybox:latest/exists 204 + cleanBuildTest # vim: filetype=sh |