Skip to content

Commit ce6011c

Browse files
Merge pull request #766 from wking/cap-validation
schema/defs-linux: Drop 'Capability' type
2 parents 6cc08c2 + ca6e025 commit ce6011c

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
@@ -145,35 +145,35 @@
145145
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/bounding",
146146
"type": "array",
147147
"items": {
148-
"$ref": "defs-linux.json#/definitions/Capability"
148+
"type": "string"
149149
}
150150
},
151151
"permitted": {
152152
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/permitted",
153153
"type": "array",
154154
"items": {
155-
"$ref": "defs-linux.json#/definitions/Capability"
155+
"type": "string"
156156
}
157157
},
158158
"effective": {
159159
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/effective",
160160
"type": "array",
161161
"items": {
162-
"$ref": "defs-linux.json#/definitions/Capability"
162+
"type": "string"
163163
}
164164
},
165165
"inheritable": {
166166
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/inheritable",
167167
"type": "array",
168168
"items": {
169-
"$ref": "defs-linux.json#/definitions/Capability"
169+
"type": "string"
170170
}
171171
},
172172
"ambient": {
173173
"id": "https://opencontainers.org/schema/bundle/process/linux/capabilities/ambient",
174174
"type": "array",
175175
"items": {
176-
"$ref": "defs-linux.json#/definitions/Capability"
176+
"type": "string"
177177
}
178178
}
179179
}

schema/defs-linux.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@
9595
"names"
9696
]
9797
},
98-
"Capability": {
99-
"description": "Linux process capabilities",
100-
"type": "string",
101-
"pattern": "^CAP_([A-Z]|_)+$"
102-
},
10398
"Major": {
10499
"description": "major device number",
105100
"$ref": "defs.json#/definitions/int64"

0 commit comments

Comments
 (0)