github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-31 22:28:33 +00:00
Code Issues Projects Releases Wiki Activity

Vendor after merging mtrmac/image:remove-signatures

Browse Source
This commit is contained in:
Miloslav Trmač
2016-09-01 22:17:04 +02:00
parent 1bfb549f7f
commit 7c2a47f8b9
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/github.com/containers/image/copy/copy.go generated vendored
View File

@@ -76,7 +76,8 @@ func (d *digestingReader) Read(p []byte) (int, error) {
// Options allows supplying non-default configuration modifying the behavior of CopyImage.
type Options struct {
SignBy string // If non-empty, asks for a signature to be added during the copy, and specifies a key ID, as accepted by signature.NewGPGSigningMechanism().SignDockerManifest(),
RemoveSignatures bool // Remove any pre-existing signatures. SignBy will still add a new signature.
SignBy string // If non-empty, asks for a signature to be added during the copy, and specifies a key ID, as accepted by signature.NewGPGSigningMechanism().SignDockerManifest(),
}
// Image copies image from srcRef to destRef, using policyContext to validate source image admissibility.
@@ -101,9 +102,16 @@ func Image(ctx *types.SystemContext, policyContext *signature.PolicyContext, des
return fmt.Errorf("Error reading manifest: %v", err)
}
sigs, err := src.Signatures()
if err != nil {
return fmt.Errorf("Error reading signatures: %v", err)
var sigs [][]byte
if options != nil && options.RemoveSignatures {
sigs = [][]byte{}
} else {
s, err := src.Signatures()
if err != nil {
return fmt.Errorf("Error reading signatures: %v", err)
}
sigs = s
// FIXME: Fail early if we can detect that RemoveSignatures should be used.
}
blobDigests, err := src.BlobDigests()