schema: Remove string pointers

Catch up with 868e631 (Remove string pointers, 2017-01-12, opencontainers#653). Signed-off-by: W. Trevor King <wking@tremily.us>
wking · Jan 13, 2017 · c6c68c7 · c6c68c7
1 parent f298e10
commit c6c68c7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/schema/config-linux.json b/schema/config-linux.json
@@ -179,11 +179,11 @@
                         "properties": {
                             "cpus": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/cpus",
-                                "$ref": "defs.json#/definitions/stringPointer"
+                                "$ref": "defs.json#/definitions/string"
                             },
                             "mems": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/mems",
-                                "$ref": "defs.json#/definitions/stringPointer"
+                                "$ref": "defs.json#/definitions/string"
                             },
                             "period": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/period",

diff --git a/schema/defs-linux.json b/schema/defs-linux.json
@@ -230,7 +230,7 @@
                     "type": "boolean"
                 },
                 "type": {
-                    "$ref": "defs.json#/definitions/stringPointer"
+                    "$ref": "defs.json#/definitions/string"
                 },
                 "major": {
                     "oneOf": [
@@ -253,7 +253,7 @@
                     ]
                 },
                 "access": {
-                    "$ref": "defs.json#/definitions/stringPointer"
+                    "$ref": "defs.json#/definitions/string"
                 }
             },
             "required": [

diff --git a/schema/defs.json b/schema/defs.json
@@ -86,16 +86,6 @@
                 }
             ]
         },
-        "stringPointer": {
-            "oneOf": [
-                {
-                    "type": "string"
-                },
-                {
-                    "type": "null"
-                }
-            ]
-        },
         "mapStringString": {
             "type": "object",
             "patternProperties": {