Merge pull request opencontainers#303 from runcom/fix-297

Fixies to img: and schema:

Author: vbatts

img/media-types.dot

@@ -3,11 +3,10 @@ digraph G {
     manifestList [shape=note, label="Manifest list\n<<optional>>\napplication/vnd.oci.image.manifest.list.v1+json"]
     manifest [shape=note, label="Image manifest\napplication/vnd.oci.image.manifest.v1+json"]
     config [shape=note, label="Image JSON\napplication/vnd.oci.image.config.v1+json"]
-    layer [shape=note, label="Layer tar+gzip\napplication/vnd.oci.image.layer.tar+gzip"]
+    layer [shape=note, label="Layer tar+gzip\napplication/vnd.oci.image.layer.tar+gzip\napplication/vnd.oci.image.layer.nondistributable.tar+gzip"]
   }
 
   manifestList -> manifest [label="1..*"]
   manifest -> config [label="1..1"]
   manifest -> layer [label="1..*"]
-  combined
 }

img/media-types.png

@@ -37,17 +37,18 @@ func TestManifest(t *testing.T) {
 			fail: true,
 		},
 
-		// expected failure: config.size is integer, expected string
+		// expected failure: config.size is a string, expected integer
 		{
 			manifest: `
 {
   "schemaVersion": 2,
   "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
-    "mediaType": "application/vnd.oci.image.serialization.v1+json",
+    "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": "1470",
     "digest": "sha256:c86f7763873b6c0aae22d963bab59b4f5debbed6685761b5951584f6efb0633b"
-  }
+  },
+  "layers": []
 }
 `,
 			fail: true,
@@ -60,14 +61,15 @@ func TestManifest(t *testing.T) {
   "schemaVersion": 2,
   "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
-    "mediaType": "application/vnd.oci.image.serialization.v1+json",
+    "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,
     "digest": "sha256:c86f7763873b6c0aae22d963bab59b4f5debbed6685761b5951584f6efb0633b"
   },
   "layers": [
     {
       "mediaType": "application/vnd.oci.image.layer.tar+gzip",
-      "size": "675598"
+      "size": "675598",
+      "digest": "sha256:c86f7763873b6c0aae22d963bab59b4f5debbed6685761b5951584f6efb0633b"
     }
   ]
 }
@@ -82,7 +84,7 @@ func TestManifest(t *testing.T) {
   "schemaVersion": 2,
   "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
-    "mediaType": "application/vnd.oci.image.serialization.v1+json",
+    "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,
     "digest": "sha256:c86f7763873b6c0aae22d963bab59b4f5debbed6685761b5951584f6efb0633b"
   },