Merge pull request #150 from q384566678/up-image-spec

vendor: update image-spec to rc6

Author: stevvooe

glide.lock

@@ -3,7 +3,7 @@ import:
 - package: github.com/opencontainers/go-digest
   version: v1.0.0-rc0
 - package: github.com/opencontainers/image-spec
-  version: v1.0.0-rc5
+  version: v1.0.0-rc6
   subpackages:
   - schema
   - specs-go/v1

glide.yaml

@@ -27,7 +27,7 @@ import (
 
 func listReferences(w walker) (map[string]*v1.Descriptor, error) {
 	refs := make(map[string]*v1.Descriptor)
-	var index v1.ImageIndex
+	var index v1.Index
 
 	if err := w.walk(func(path string, info os.FileInfo, r io.Reader) error {
 		if info.IsDir() || filepath.Clean(path) != "index.json" {
@@ -39,8 +39,8 @@ func listReferences(w walker) (map[string]*v1.Descriptor, error) {
 		}
 
 		for i := 0; i < len(index.Manifests); i++ {
-			if index.Manifests[i].Descriptor.Annotations["org.opencontainers.ref.name"] != "" {
-				refs[index.Manifests[i].Descriptor.Annotations["org.opencontainers.ref.name"]] = &index.Manifests[i].Descriptor
+			if index.Manifests[i].Annotations["org.opencontainers.ref.name"] != "" {
+				refs[index.Manifests[i].Annotations["org.opencontainers.ref.name"]] = &index.Manifests[i]
 			}
 		}
 
@@ -53,7 +53,7 @@ func listReferences(w walker) (map[string]*v1.Descriptor, error) {
 
 func findDescriptor(w walker, name string) (*v1.Descriptor, error) {
 	var d v1.Descriptor
-	var index v1.ImageIndex
+	var index v1.Index
 
 	switch err := w.walk(func(path string, info os.FileInfo, r io.Reader) error {
 		if info.IsDir() || filepath.Clean(path) != "index.json" {
@@ -65,8 +65,8 @@ func findDescriptor(w walker, name string) (*v1.Descriptor, error) {
 		}
 
 		for i := 0; i < len(index.Manifests); i++ {
-			if index.Manifests[i].Descriptor.Annotations["org.opencontainers.ref.name"] == name {
-				d = index.Manifests[i].Descriptor
+			if index.Manifests[i].Annotations["org.opencontainers.ref.name"] == name {
+				d = index.Manifests[i]
 				return errEOW
 			}
 		}

image/descriptor.go

@@ -129,7 +129,10 @@ var (
 }
  `
 	manifestStr = `{
-    "annotations": null,
+      "annotations": {
+        "org.freedesktop.specifications.metainfo.version": "1.0",
+        "org.freedesktop.specifications.metainfo.type": "AppStream"
+      },
     "config": {
         "digest": "<config_digest>",
         "mediaType": "application/vnd.oci.image.config.v1+json",