diff --git a/schema/config-linux.json b/schema/config-linux.json index 0da996aa..ecaba776 100644 --- 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", @@ -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", diff --git a/schema/defs-linux.json b/schema/defs-linux.json index 0cecb14a..c7b5339f 100644 --- 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 index 89523607..206e7dd3 100644 --- a/schema/defs.json +++ b/schema/defs.json @@ -86,16 +86,6 @@ } ] }, - "stringPointer": { - "oneOf": [ - { - "type": "string" - }, - { - "type": "null" - } - ] - }, "mapStringString": { "type": "object", "patternProperties": {