Skip to content

Commit c5cc655

Browse files
paravmellanoxparavmellanox
authored
Revert "Rebase" (#3)
* Revert "schema: Completely drop our JSON Schema 'id' properties" This reverts commit ff0fc66. * Revert "schema: add allowed values for defaultAction" This reverts commit 9c166f2.
1 parent ff0fc66 commit c5cc655

File tree

5 files changed

+125
-1
lines changed

5 files changed

+125
-1
lines changed

‎schema/config-linux.json‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
{
22
"linux": {
33
"description": "Linux platform-specific configurations",
4+
"id": "https://opencontainers.org/schema/bundle/linux",
45
"type": "object",
56
"properties": {
67
"devices": {
8+
"id": "https://opencontainers.org/schema/bundle/linux/devices",
79
"type": "array",
810
"items": {
911
"$ref": "defs-linux.json#/definitions/Device"
1012
}
1113
},
1214
"uidMappings": {
15+
"id": "https://opencontainers.org/schema/bundle/linux/uidMappings",
1316
"type": "array",
1417
"items": {
1518
"$ref": "defs.json#/definitions/IDMapping"
1619
}
1720
},
1821
"gidMappings": {
22+
"id": "https://opencontainers.org/schema/bundle/linux/gidMappings",
1923
"type": "array",
2024
"items": {
2125
"$ref": "defs.json#/definitions/IDMapping"
2226
}
2327
},
2428
"namespaces": {
29+
"id": "https://opencontainers.org/schema/bundle/linux/namespaces",
2530
"type": "array",
2631
"items": {
2732
"anyOf": [
@@ -32,18 +37,22 @@
3237
}
3338
},
3439
"resources": {
40+
"id": "https://opencontainers.org/schema/bundle/linux/resources",
3541
"type": "object",
3642
"properties": {
3743
"devices": {
44+
"id": "https://opencontainers.org/schema/bundle/linux/resources/devices",
3845
"type": "array",
3946
"items": {
4047
"$ref": "defs-linux.json#/definitions/DeviceCgroup"
4148
}
4249
},
4350
"pids": {
51+
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids",
4452
"type": "object",
4553
"properties": {
4654
"limit": {
55+
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids/limit",
4756
"$ref": "defs.json#/definitions/int64"
4857
}
4958
},
@@ -52,39 +61,47 @@
5261
]
5362
},
5463
"blockIO": {
64+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO",
5565
"type": "object",
5666
"properties": {
5767
"weight": {
68+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/weight",
5869
"$ref": "defs-linux.json#/definitions/weight"
5970
},
6071
"leafWeight": {
72+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/leafWeight",
6173
"$ref": "defs-linux.json#/definitions/weight"
6274
},
6375
"throttleReadBpsDevice": {
76+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleReadBpsDevice",
6477
"type": "array",
6578
"items": {
6679
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
6780
}
6881
},
6982
"throttleWriteBpsDevice": {
83+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleWriteBpsDevice",
7084
"type": "array",
7185
"items": {
7286
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
7387
}
7488
},
7589
"throttleReadIOPSDevice": {
90+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleReadIOPSDevice",
7691
"type": "array",
7792
"items": {
7893
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
7994
}
8095
},
8196
"throttleWriteIOPSDevice": {
97+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleWriteIOPSDevice",
8298
"type": "array",
8399
"items": {
84100
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
85101
}
86102
},
87103
"weightDevice": {
104+
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/weightDevice",
88105
"type": "array",
89106
"items": {
90107
"$ref": "defs-linux.json#/definitions/blockIODeviceWeight"
@@ -93,32 +110,41 @@
93110
}
94111
},
95112
"cpu": {
113+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu",
96114
"type": "object",
97115
"properties": {
98116
"cpus": {
117+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/cpus",
99118
"type": "string"
100119
},
101120
"mems": {
121+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/mems",
102122
"type": "string"
103123
},
104124
"period": {
125+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/period",
105126
"$ref": "defs.json#/definitions/uint64"
106127
},
107128
"quota": {
129+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/quota",
108130
"$ref": "defs.json#/definitions/int64"
109131
},
110132
"realtimePeriod": {
133+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/realtimePeriod",
111134
"$ref": "defs.json#/definitions/uint64"
112135
},
113136
"realtimeRuntime": {
137+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/realtimeRuntime",
114138
"$ref": "defs.json#/definitions/int64"
115139
},
116140
"shares": {
141+
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/shares",
117142
"$ref": "defs.json#/definitions/uint64"
118143
}
119144
}
120145
},
121146
"hugepageLimits": {
147+
"id": "https://opencontainers.org/schema/bundle/linux/resources/hugepageLimits",
122148
"type": "array",
123149
"items": {
124150
"type": "object",
@@ -137,38 +163,49 @@
137163
}
138164
},
139165
"memory": {
166+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory",
140167
"type": "object",
141168
"properties": {
142169
"kernel": {
170+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel",
143171
"$ref": "defs.json#/definitions/int64"
144172
},
145173
"kernelTCP": {
174+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernelTCP",
146175
"$ref": "defs.json#/definitions/int64"
147176
},
148177
"limit": {
178+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit",
149179
"$ref": "defs.json#/definitions/int64"
150180
},
151181
"reservation": {
182+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/reservation",
152183
"$ref": "defs.json#/definitions/int64"
153184
},
154185
"swap": {
186+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/swap",
155187
"$ref": "defs.json#/definitions/int64"
156188
},
157189
"swappiness": {
190+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/swappiness",
158191
"$ref": "defs.json#/definitions/uint64"
159192
},
160193
"disableOOMKiller": {
194+
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/disableOOMKiller",
161195
"type": "boolean"
162196
}
163197
}
164198
},
165199
"network": {
200+
"id": "https://opencontainers.org/schema/bundle/linux/resources/network",
166201
"type": "object",
167202
"properties": {
168203
"classID": {
204+
"id": "https://opencontainers.org/schema/bundle/linux/resources/network/classId",
169205
"$ref": "defs.json#/definitions/uint32"
170206
},
171207
"priorities": {
208+
"id": "https://opencontainers.org/schema/bundle/linux/resources/network/priorities",
172209
"type": "array",
173210
"items": {
174211
"$ref": "defs-linux.json#/definitions/NetworkInterfacePriority"
@@ -185,24 +222,30 @@
185222
}
186223
},
187224
"cgroupsPath": {
225+
"id": "https://opencontainers.org/schema/bundle/linux/cgroupsPath",
188226
"type": "string"
189227
},
190228
"rootfsPropagation": {
229+
"id": "https://opencontainers.org/schema/bundle/linux/rootfsPropagation",
191230
"$ref": "defs-linux.json#/definitions/RootfsPropagation"
192231
},
193232
"seccomp": {
233+
"id": "https://opencontainers.org/schema/bundle/linux/seccomp",
194234
"type": "object",
195235
"properties": {
196236
"defaultAction": {
197-
"$ref": "defs-linux.json#/definitions/SeccompAction"
237+
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/defaultAction",
238+
"type": "string"
198239
},
199240
"architectures": {
241+
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/architectures",
200242
"type": "array",
201243
"items": {
202244
"$ref": "defs-linux.json#/definitions/SeccompArch"
203245
}
204246
},
205247
"syscalls": {
248+
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/syscalls",
206249
"type": "array",
207250
"items": {
208251
"$ref": "defs-linux.json#/definitions/Syscall"
@@ -214,21 +257,27 @@
214257
]
215258
},
216259
"sysctl": {
260+
"id": "https://opencontainers.org/schema/bundle/linux/sysctl",
217261
"$ref": "defs.json#/definitions/mapStringString"
218262
},
219263
"maskedPaths": {
264+
"id": "https://opencontainers.org/schema/bundle/linux/maskedPaths",
220265
"$ref": "defs.json#/definitions/ArrayOfStrings"
221266
},
222267
"readonlyPaths": {
268+
"id": "https://opencontainers.org/schema/bundle/linux/readonlyPaths",
223269
"$ref": "defs.json#/definitions/ArrayOfStrings"
224270
},
225271
"mountLabel": {
272+
"id": "https://opencontainers.org/schema/bundle/linux/mountLabel",
226273
"type": "string"
227274
},
228275
"intelRdt": {
276+
"id": "https://opencontainers.org/schema/bundle/linux/intelRdt",
229277
"type": "object",
230278
"properties": {
231279
"l3CacheSchema": {
280+
"id": "https://opencontainers.org/schema/bundle/linux/intelRdt/l3CacheSchema",
232281
"type": "string"
233282
}
234283
}

0 commit comments

Comments
 (0)