diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 09:53:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 09:53:46 -0400 |
| commit | 8f19efb51951c9f88e8def089c9d2e6446d4af01 (patch) | |
| tree | 5227f6c65e7469f6f129f7d38d7ba4eb1d47e16c /pkg/api | |
| parent | 7910bfd7c1f93a9bac73ae855a1eb6b63aa642a2 (diff) | |
| parent | 49c5688a30ac29b258196d0be73cc7f09a9705cb (diff) | |
| download | podman-8f19efb51951c9f88e8def089c9d2e6446d4af01.tar.gz podman-8f19efb51951c9f88e8def089c9d2e6446d4af01.tar.bz2 podman-8f19efb51951c9f88e8def089c9d2e6446d4af01.zip | |
Merge pull request #11678 from vrothberg/fix-11613
podman save: add `--uncompressed`
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 18 | ||||
| -rw-r--r-- | pkg/api/server/register_images.go | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index b4f08a746..51157d204 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -289,9 +289,10 @@ func ExportImages(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime) decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder) query := struct { - Compress bool `schema:"compress"` - Format string `schema:"format"` - References []string `schema:"references"` + Compress bool `schema:"compress"` + Format string `schema:"format"` + OciAcceptUncompressedLayers bool `schema:"ociAcceptUncompressedLayers"` + References []string `schema:"references"` }{ Format: define.OCIArchive, } @@ -353,11 +354,12 @@ func ExportImages(w http.ResponseWriter, r *http.Request) { // Use the ABI image engine to share as much code as possible. opts := entities.ImageSaveOptions{ - Compress: query.Compress, - Format: query.Format, - MultiImageArchive: len(query.References) > 1, - Output: output, - RemoveSignatures: true, + Compress: query.Compress, + Format: query.Format, + MultiImageArchive: len(query.References) > 1, + OciAcceptUncompressedLayers: query.OciAcceptUncompressedLayers, + Output: output, + RemoveSignatures: true, } imageEngine := abi.ImageEngine{Libpod: runtime} diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 95981226c..dce609a4e 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -1150,6 +1150,10 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // name: compress // type: boolean // description: use compression on image + // - in: query + // name: ociAcceptUncompressedLayers + // type: boolean + // description: accept uncompressed layers when copying OCI images // produces: // - application/json // responses: |