From ca6e025818f7b0baf2349eee1d8e662401d9d64d Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 11 Apr 2017 10:13:20 -0700 Subject: [PATCH] schema/defs-linux: Drop 'Capability' type The current "For example, valid values for Linux..." wording in config.md does not seem strong enough to support this condition, especially since the spec makes no claims about what valid capabilities are for non-Linux OSes. And process.capabilities has been nominally legal for non-Linux OSes since 718f9f3f (minor narrative cleanup regarding config compatibility, 2017-01-30, #673). Signed-off-by: W. Trevor King --- schema/config-schema.json | 10 +++++----- schema/defs-linux.json | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/schema/config-schema.json b/schema/config-schema.json index 87e46dfe..619a429d 100644 --- a/schema/config-schema.json +++ b/schema/config-schema.json @@ -141,35 +141,35 @@ "id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/bounding", "type": "array", "items": { - "$ref": "defs-linux.json#/definitions/Capability" + "type": "string" } }, "permitted": { "id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/permitted", "type": "array", "items": { - "$ref": "defs-linux.json#/definitions/Capability" + "type": "string" } }, "effective": { "id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/effective", "type": "array", "items": { - "$ref": "defs-linux.json#/definitions/Capability" + "type": "string" } }, "inheritable": { "id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/inheritable", "type": "array", "items": { - "$ref": "defs-linux.json#/definitions/Capability" + "type": "string" } }, "ambient": { "id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/ambient", "type": "array", "items": { - "$ref": "defs-linux.json#/definitions/Capability" + "type": "string" } } } diff --git a/schema/defs-linux.json b/schema/defs-linux.json index 09403765..1eee9382 100644 --- a/schema/defs-linux.json +++ b/schema/defs-linux.json @@ -82,11 +82,6 @@ } } }, - "Capability": { - "description": "Linux process capabilities", - "type": "string", - "pattern": "^CAP_([A-Z]|_)+$" - }, "Major": { "description": "major device number", "$ref": "defs.json#/definitions/int64"