vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix content type for schema1 signed manifests

Browse source 
The Payload function for schema1 currently returns a signed manifest,
but indicates the content type is that of a manifest that isn't signed.

Note that this breaks compatibility with Registry 2.3 alpha 1 and
Docker 1.10-rc1, because they use the incorrect content type.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2016-01-18 10:26:45 -08:00
parent 3cb403ae5b
commit 8c1a000799
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
manifest/schema1/manifest.go
View file

@ -39,11 +39,11 @@ func init() {
desc := distribution.Descriptor{
Digest: digest.FromBytes(sm.Canonical),
Size: int64(len(sm.Canonical)),
MediaType: MediaTypeManifest,
MediaType: MediaTypeSignedManifest,
}
return sm, desc, err
}
err := distribution.RegisterManifestSchema(MediaTypeManifest, schema1Func)
err := distribution.RegisterManifestSchema(MediaTypeSignedManifest, schema1Func)
if err != nil {
panic(fmt.Sprintf("Unable to register manifest: %s", err))
}
@ -167,7 +167,7 @@ func (sm *SignedManifest) MarshalJSON() ([]byte, error) {
// Payload returns the signed content of the signed manifest.
func (sm SignedManifest) Payload() (string, []byte, error) {
return MediaTypeManifest, sm.all, nil
return MediaTypeSignedManifest, sm.all, nil
}
// Signatures returns the signatures as provided by