schema/defs.json: Pull annotations over from config-schema.json

So we can use it in the coming state-schema.json without duplication. I dropped the "id" because none of the other defs.json entries had an ID. Signed-off-by: W. Trevor King <[email protected]>
opencontainers · Jun 6, 2016 · 35b17a2 · 35b17a2
1 parent 500e344
commit 35b17a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/schema/config-schema.json b/schema/config-schema.json
@@ -24,15 +24,7 @@
             }
         },
         "annotations": {
-            "id": "https://opencontainers.org/schema/bundle/annotations",
-            "oneOf": [
-                {
-                    "$ref": "defs.json#/definitions/mapStringString"
-                },
-                {
-                    "type": "null"
-                }
-            ]
+            "$ref": "defs.json#/definitions/annotations"
         },
         "hostname": {
             "id": "https://opencontainers.org/schema/bundle/hostname",

diff --git a/schema/defs.json b/schema/defs.json
@@ -159,6 +159,16 @@
         "ociVersion": {
             "description": "The version of Open Container Runtime Specification that the document complies with",
             "type": "string"
+        },
+        "annotations": {
+            "oneOf": [
+                {
+                    "$ref": "#/definitions/mapStringString"
+                },
+                {
+                    "type": "null"
+                }
+            ]
         }
     }
 }