From 9795a19aa4b93d0c0fa99db53bf37413c5e1961d Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 31 Oct 2016 09:58:01 +0800 Subject: [PATCH] Modify the automatic determination of the Config type Signed-off-by: zhouhao --- image/autodetect.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/image/autodetect.go b/image/autodetect.go index c7f6363..ef15a8e 100644 --- a/image/autodetect.go +++ b/image/autodetect.go @@ -79,8 +79,8 @@ func Autodetect(path string) (string, error) { header := struct { SchemaVersion int `json:"schemaVersion"` - MediaType string `json:"mediaType"` Config interface{} `json:"config"` + Manifests interface{} `json:"manifests"` }{} if err := json.NewDecoder(f).Decode(&header); err != nil { @@ -97,13 +97,13 @@ func Autodetect(path string) (string, error) { } switch { - case header.MediaType == string(schema.ValidatorMediaTypeManifest): + case header.SchemaVersion == 2 && header.Config != nil: return TypeManifest, nil - case header.MediaType == string(schema.ValidatorMediaTypeImageIndex): + case header.Manifests != nil: return TypeImageIndex, nil - case header.MediaType == "" && header.SchemaVersion == 0 && header.Config != nil: + case header.SchemaVersion == 0 && header.Config != nil: // config files don't have mediaType/schemaVersion header return TypeConfig, nil }