Skip to content

Commit ca6e025

Browse files
committed
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 718f9f3 (minor narrative cleanup regarding config compatibility, 2017-01-30, #673). Signed-off-by: W. Trevor King <[email protected]>
1 parent daba39c commit ca6e025

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

schema/config-schema.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,35 +141,35 @@
141141
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/bounding",
142142
"type": "array",
143143
"items": {
144-
"$ref": "defs-linux.json#/definitions/Capability"
144+
"type": "string"
145145
}
146146
},
147147
"permitted": {
148148
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/permitted",
149149
"type": "array",
150150
"items": {
151-
"$ref": "defs-linux.json#/definitions/Capability"
151+
"type": "string"
152152
}
153153
},
154154
"effective": {
155155
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/effective",
156156
"type": "array",
157157
"items": {
158-
"$ref": "defs-linux.json#/definitions/Capability"
158+
"type": "string"
159159
}
160160
},
161161
"inheritable": {
162162
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/inheritable",
163163
"type": "array",
164164
"items": {
165-
"$ref": "defs-linux.json#/definitions/Capability"
165+
"type": "string"
166166
}
167167
},
168168
"ambient": {
169169
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/ambient",
170170
"type": "array",
171171
"items": {
172-
"$ref": "defs-linux.json#/definitions/Capability"
172+
"type": "string"
173173
}
174174
}
175175
}

schema/defs-linux.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,6 @@
8282
}
8383
}
8484
},
85-
"Capability": {
86-
"description": "Linux process capabilities",
87-
"type": "string",
88-
"pattern": "^CAP_([A-Z]|_)+$"
89-
},
9085
"Major": {
9186
"description": "major device number",
9287
"$ref": "defs.json#/definitions/int64"

0 commit comments

Comments
 (0)