summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi/images.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-23 09:38:25 -0400
committerGitHub <noreply@github.com>2021-09-23 09:38:25 -0400
commitb08acdbc6bfc599c8d9db7f7c8fe24b5d11b64b3 (patch)
tree493283039d06b0518153ca5e618060dd99cfe063 /pkg/domain/infra/abi/images.go
parent3d34d3a186a782e48bdbd1245a7e067db850d9b0 (diff)
parent01bf8a66872df7dc6f93b7156371fa8fce3d84df (diff)
downloadpodman-b08acdbc6bfc599c8d9db7f7c8fe24b5d11b64b3.tar.gz
podman-b08acdbc6bfc599c8d9db7f7c8fe24b5d11b64b3.tar.bz2
podman-b08acdbc6bfc599c8d9db7f7c8fe24b5d11b64b3.zip
Merge pull request #11714 from vrothberg/save-remove-signatures
podman save: enforce signature removal
Diffstat (limited to 'pkg/domain/infra/abi/images.go')
-rw-r--r--pkg/domain/infra/abi/images.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 705ad7768..98d668434 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -368,7 +368,10 @@ func (ir *ImageEngine) Save(ctx context.Context, nameOrID string, tags []string,
saveOptions := &libimage.SaveOptions{}
saveOptions.DirForceCompress = options.Compress
saveOptions.OciAcceptUncompressedLayers = options.OciAcceptUncompressedLayers
- saveOptions.RemoveSignatures = options.RemoveSignatures
+
+ // Force signature removal to preserve backwards compat.
+ // See https://github.com/containers/podman/pull/11669#issuecomment-925250264
+ saveOptions.RemoveSignatures = true
if !options.Quiet {
saveOptions.Writer = os.Stderr