Merge pull request #111 from cyphar/fix-layer-validation

coolljt0725 · web-flow · commit a358e03fde4e · 2017-02-10T11:40:26.000+08:00
image: make layer validation work
diff --git a/image/manifest.go b/image/manifest.go
@@ -75,8 +75,15 @@ func (m *manifest) validate(w walker) error {
 		return errors.Wrap(err, "config validation failed")
 	}
 
+	validLayerMediaTypes := []string{
+		v1.MediaTypeImageLayer,
+		v1.MediaTypeImageLayerGzip,
+		v1.MediaTypeImageLayerNonDistributable,
+		v1.MediaTypeImageLayerNonDistributableGzip,
+	}
+
 	for _, d := range m.Layers {
-		if err := d.validate(w, []string{v1.MediaTypeImageLayer}); err != nil {
+		if err := d.validate(w, validLayerMediaTypes); err != nil {
 			return errors.Wrap(err, "layer validation failed")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,15 @@ func (m *manifest) validate(w walker) error {`
`75`	`75`	`return errors.Wrap(err, "config validation failed")`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ validLayerMediaTypes := []string{`
	`79`	`+ v1.MediaTypeImageLayer,`
	`80`	`+ v1.MediaTypeImageLayerGzip,`
	`81`	`+ v1.MediaTypeImageLayerNonDistributable,`
	`82`	`+ v1.MediaTypeImageLayerNonDistributableGzip,`
	`83`	`+ }`
	`84`	`+`
`78`	`85`	`for _, d := range m.Layers {`
`79`		`- if err := d.validate(w, []string{v1.MediaTypeImageLayer}); err != nil {`
	`86`	`+ if err := d.validate(w, validLayerMediaTypes); err != nil {`
`80`	`87`	`return errors.Wrap(err, "layer validation failed")`
`81`	`88`	`}`
`82`	`89`	`}`