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/domain | |
| 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/domain')
| -rw-r--r-- | pkg/domain/entities/images.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index c575212b1..edd23e662 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -301,6 +301,8 @@ type ImageSaveOptions struct { // than one image. Additional tags will be interpreted as references // to images which are added to the archive. MultiImageArchive bool + // Accept uncompressed layers when copying OCI images. + OciAcceptUncompressedLayers bool // Output - write image to the specified path. Output string // Do not save the signature from the source image diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index a88d38a10..f8ee0304d 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -367,6 +367,7 @@ func (ir *ImageEngine) Load(ctx context.Context, options entities.ImageLoadOptio func (ir *ImageEngine) Save(ctx context.Context, nameOrID string, tags []string, options entities.ImageSaveOptions) error { saveOptions := &libimage.SaveOptions{} saveOptions.DirForceCompress = options.Compress + saveOptions.OciAcceptUncompressedLayers = options.OciAcceptUncompressedLayers saveOptions.RemoveSignatures = options.RemoveSignatures if !options.Quiet { diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 9a746d68c..282770613 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -256,6 +256,7 @@ func (ir *ImageEngine) Save(ctx context.Context, nameOrID string, tags []string, err error ) options := new(images.ExportOptions).WithFormat(opts.Format).WithCompress(opts.Compress) + options = options.WithOciAcceptUncompressedLayers(opts.OciAcceptUncompressedLayers) switch opts.Format { case "oci-dir", "docker-dir": |