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

Move MediaType into manifest.Versioned

Browse source 
This makes content type sniffing cleaner. The document just needs to be
decoded into a manifest.Versioned structure. It's no longer a two-step
process.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2016-01-06 14:15:14 -08:00
parent 697af09566
commit 6d17423a6d
7 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
manifest/manifestlist/manifestlist.go
View file

@ -17,6 +17,7 @@ const MediaTypeManifestList = "application/vnd.docker.distribution.manifest.list
// packages version of the manifest.
var SchemaVersion = manifest.Versioned{
SchemaVersion: 2,
MediaType: MediaTypeManifestList,
}
func init() {
@ -68,10 +69,6 @@ type ManifestDescriptor struct {
type ManifestList struct {
manifest.Versioned
// MediaType is the media type of this document. It should always
// be set to MediaTypeManifestList.
MediaType string `json:"mediaType"`
// Config references the image configuration as a blob.
Manifests []ManifestDescriptor `json:"manifests"`
}
@ -102,7 +99,6 @@ type DeserializedManifestList struct {
func FromDescriptors(descriptors []ManifestDescriptor) (*DeserializedManifestList, error) {
m := ManifestList{
Versioned: SchemaVersion,
MediaType: MediaTypeManifestList,
}
m.Manifests = make([]ManifestDescriptor, len(descriptors), len(descriptors))