schema: Remove string pointers

Catch up with 868e631 (Remove string pointers, 2017-01-12, #653).

Signed-off-by: W. Trevor King <[email protected]>

Author: wking

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",
@@ -290,14 +290,8 @@
                 }
             },
             "cgroupsPath": {
-                "oneOf": [
-                    {
-                        "type": "null"
-                    },
-                    {
-                        "type": "string"
-                    }
-                ]
+                "id": "https://opencontainers.org/schema/bundle/linux/cgroupsPath",
+                "$ref": "defs.json#/definitions/string"
             },
             "rootfsPropagation": {
                 "id": "https://opencontainers.org/schema/bundle/linux/rootfsPropagation",

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

schema/defs.json

@@ -86,16 +86,6 @@
                 }
             ]
         },
-        "stringPointer": {
-            "oneOf": [
-                {
-                    "type": "string"
-                },
-                {
-                    "type": "null"
-                }
-            ]
-        },
         "mapStringString": {
             "type": "object",
             "patternProperties": {