schema: urls optimization

Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
opencontainers · Mar 8, 2017 · 20ad7f7 · 20ad7f7
1 parent b36dbc4
commit 20ad7f7
Show file tree

Hide file tree

Showing 6 changed files with 10,956 additions and 9,802 deletions.
diff --git a/schema/content-descriptor.json b/schema/content-descriptor.json
@@ -6,27 +6,23 @@
   "properties": {
     "mediaType": {
       "description": "the mediatype of the referenced object",
-      "$ref": "defs-image.json#/definitions/mediaType"
+      "$ref": "defs-descriptor.json#/definitions/mediaType"
     },
     "size": {
       "description": "the size in bytes of the referenced object",
       "$ref": "defs.json#/definitions/int64"
     },
     "digest": {
       "description": "the cryptographic checksum digest of the object, in the pattern '<hash>:<hexadecimal digest>'",
-      "$ref": "defs-image.json#/definitions/digest"
+      "$ref": "defs-descriptor.json#/definitions/digest"
     },
     "urls": {
       "description": "a list of urls from which this object may be downloaded",
-      "type": "array",
-      "items": {
-        "type": "string",
-        "format": "uri"
-      }
+      "$ref": "defs-descriptor.json#/definitions/urls"
     },
     "annotations": {
       "id": "https://opencontainers.org/schema/image/descriptor/annotations",
-      "$ref": "defs-image.json#/definitions/annotations"
+      "$ref": "defs-descriptor.json#/definitions/annotations"
     }
   },
   "required": [

diff --git a/schema/defs-descriptor.json b/schema/defs-descriptor.json
@@ -0,0 +1,34 @@
+{
+  "description": "Definitions particular to OpenContainer Descriptor Specification",
+  "definitions": {
+    "mediaType": {
+      "id": "https://opencontainers.org/schema/image/descriptor/mediaType",
+      "type": "string",
+      "pattern": "^[A-Za-z0-9][A-Za-z0-9!#$&-^_.+]{0,126}/[A-Za-z0-9][A-Za-z0-9!#$&-^_.+]{0,126}$"
+    },
+    "digest": {
+      "description": "the cryptographic checksum digest of the object, in the pattern '<hash>:<hexadecimal digest>'",
+      "type": "string",
+      "pattern": "^[a-z0-9_+.-]+:[a-f0-9]+$"
+    },
+    "urls": {
+      "description": "a list of urls from which this object may be downloaded",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "format": "uri"
+      }
+    },
+    "annotations": {
+      "id": "https://opencontainers.org/schema/image/descriptor/annotations",
+      "oneOf": [
+        {
+          "$ref": "defs.json#/definitions/mapStringString"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  }
+}
diff --git a/schema/defs-image.json b/schema/defs-image.json
@@ -1,16 +1,6 @@
 {
   "description": "Definitions particular to OpenContainer Image Specification",
   "definitions": {
-    "mediaType": {
-      "id": "https://opencontainers.org/schema/image/mediaType",
-      "type": "string",
-      "pattern": "^[A-Za-z0-9][A-Za-z0-9!#$&-^_.+]{0,126}/[A-Za-z0-9][A-Za-z0-9!#$&-^_.+]{0,126}$"
-    },
-    "digest": {
-      "description": "the cryptographic checksum digest of the object, in the pattern '<hash>:<hexadecimal digest>'",
-      "type": "string",
-      "pattern": "^[a-z0-9_+.-]+:[a-f0-9]+$"
-    },
     "manifestDescriptor": {
       "id": "https://opencontainers.org/schema/image/manifestDescriptor",
       "type": "object",
@@ -22,23 +12,19 @@
       "properties": {
         "mediaType": {
           "description": "the mediatype of the referenced object",
-          "$ref": "#/definitions/mediaType"
+          "$ref": "defs-descriptor.json#/definitions/mediaType"
         },
         "size": {
           "description": "the size in bytes of the referenced object",
           "$ref": "defs.json#/definitions/int64"
         },
         "digest": {
           "description": "the cryptographic checksum digest of the object, in the pattern '<hash>:<hexadecimal digest>'",
-          "$ref": "#/definitions/digest"
+          "$ref": "defs-descriptor.json#/definitions/digest"
         },
         "urls": {
           "description": "a list of urls from which this object may be downloaded",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "format": "uri"
-          }
+          "$ref": "defs-descriptor.json#/definitions/urls"
         },
         "platform": {
           "id": "https://opencontainers.org/schema/image/platform",
@@ -80,20 +66,9 @@
         },
         "annotations": {
           "id": "https://opencontainers.org/schema/image/descriptor/annotations",
-          "$ref": "#/definitions/annotations"
+          "$ref": "defs-descriptor.json#/definitions/annotations"
         }
       }
-    },
-    "annotations": {
-      "id": "https://opencontainers.org/schema/image/annotations",
-      "oneOf": [
-        {
-          "$ref": "defs.json#/definitions/mapStringString"
-        },
-        {
-          "type": "null"
-        }
-      ]
     }
   }
 }