Merge pull request #567 from q384566678/urls-ompt

schema: urls optimization

Author: vbatts

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": [

schema/defs-descriptor.json

@@ -0,0 +1,27 @@
+{
+  "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",
+      "$ref": "defs.json#/definitions/mapStringString"
+    }
+  }
+}