Skip to content

Commit 5076439

Browse files
author
Ma Shimiao
committed
schema: fix items based on latest spec
Signed-off-by: Ma Shimiao <[email protected]>
1 parent 6ff6acd commit 5076439

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

schema/config-linux.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,10 @@
245245
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel",
246246
"$ref": "defs.json#/definitions/int64Pointer"
247247
},
248+
"kernelTCP": {
249+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernelTCP",
250+
"$ref": "defs.json#/definitions/int64Pointer"
251+
},
248252
"limit": {
249253
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit",
250254
"$ref": "defs.json#/definitions/int64Pointer"

schema/defs-linux.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@
9696
"minimum": 0,
9797
"maximum": 512
9898
},
99-
"FilePermissions": {
100-
"type": "string"
101-
},
10299
"FileType": {
103100
"description": "Type of a block or special character device",
104101
"type": "string",
@@ -116,9 +113,6 @@
116113
"type": {
117114
"$ref": "#/definitions/FileType"
118115
},
119-
"permissions": {
120-
"$ref": "#/definitions/FilePermissions"
121-
},
122116
"path": {
123117
"$ref": "defs.json#/definitions/FilePath"
124118
},
@@ -132,10 +126,24 @@
132126
"$ref": "#/definitions/Minor"
133127
},
134128
"uid": {
135-
"$ref": "defs.json#/definitions/UID"
129+
"oneOf": [
130+
{
131+
"$ref": "defs.json#/definitions/UID"
132+
},
133+
{
134+
"type": "null"
135+
}
136+
]
136137
},
137138
"gid": {
138-
"$ref": "defs.json#/definitions/GID"
139+
"oneOf": [
140+
{
141+
"$ref": "defs.json#/definitions/GID"
142+
},
143+
{
144+
"type": "null"
145+
}
146+
]
139147
}
140148
}
141149
},

0 commit comments

Comments
 (0)