Skip to content

Commit 05fbfa3

Browse files
wkingwking
committed
schema: Replace "bundle" with "runtime configuration"
The bundle contains `config.json` and other things, but this schema is just for `config.json`. This is mostly: $ sed -i 's|/bundle|/runtime/config|' schema/*.json for the `id` fields, but I also tweaked `root.description`. Signed-off-by: W. Trevor King <[email protected]>
1 parent 878fac1 commit 05fbfa3

File tree

3 files changed

+84
-84
lines changed

3 files changed

+84
-84
lines changed

‎schema/schema-linux.json‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"linux": {
33
"description": "Linux platform-specific configurations",
4-
"id": "https://opencontainers.org/schema/bundle/linux",
4+
"id": "https://opencontainers.org/schema/runtime/config/linux",
55
"type": "object",
66
"properties": {
77
"devices": {
8-
"id": "https://opencontainers.org/schema/bundle/linux/devices",
8+
"id": "https://opencontainers.org/schema/runtime/config/linux/devices",
99
"oneOf": [
1010
{
1111
"type": "array",
@@ -19,7 +19,7 @@
1919
]
2020
},
2121
"uidMappings": {
22-
"id": "https://opencontainers.org/schema/bundle/linux/uidMappings",
22+
"id": "https://opencontainers.org/schema/runtime/config/linux/uidMappings",
2323
"oneOf": [
2424
{
2525
"type": "array",
@@ -33,7 +33,7 @@
3333
]
3434
},
3535
"gidMappings": {
36-
"id": "https://opencontainers.org/schema/bundle/linux/gidMappings",
36+
"id": "https://opencontainers.org/schema/runtime/config/linux/gidMappings",
3737
"oneOf": [
3838
{
3939
"type": "array",
@@ -47,7 +47,7 @@
4747
]
4848
},
4949
"namespaces": {
50-
"id": "https://opencontainers.org/schema/bundle/linux/namespaces",
50+
"id": "https://opencontainers.org/schema/runtime/config/linux/namespaces",
5151
"type": "array",
5252
"items": {
5353
"anyOf": [
@@ -58,38 +58,38 @@
5858
}
5959
},
6060
"resources": {
61-
"id": "https://opencontainers.org/schema/bundle/linux/resources",
61+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources",
6262
"type": "object",
6363
"properties": {
6464
"oomScoreAdj": {
65-
"id": "https://opencontainers.org/schema/bundle/linux/resources/oomScoreAdj",
65+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/oomScoreAdj",
6666
"type": "integer",
6767
"minimum": -1000,
6868
"maximum": 1000
6969
},
7070
"pids": {
71-
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids",
71+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/pids",
7272
"properties": {
7373
"limit": {
74-
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids/limit",
74+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/pids/limit",
7575
"$ref": "defs.json#/definitions/int64"
7676
}
7777
}
7878
},
7979
"blockIO": {
80-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO",
80+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO",
8181
"type": "object",
8282
"properties": {
8383
"blkioWeight": {
84-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeight",
84+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioWeight",
8585
"$ref": "defs-linux.json#/definitions/blkioWeightPointer"
8686
},
8787
"blkioLeafWeight": {
88-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioLeafWeight",
88+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioLeafWeight",
8989
"$ref": "defs-linux.json#/definitions/blkioWeightPointer"
9090
},
9191
"blkioThrottleReadBpsDevice": {
92-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioThrottleReadBpsDevice",
92+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioThrottleReadBpsDevice",
9393
"oneOf": [
9494
{
9595
"type": "array",
@@ -105,7 +105,7 @@
105105
]
106106
},
107107
"blkioThrottleWriteBpsDevice": {
108-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioThrottleWriteBpsDevice",
108+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioThrottleWriteBpsDevice",
109109
"oneOf": [
110110
{
111111
"type": "array",
@@ -119,7 +119,7 @@
119119
]
120120
},
121121
"blkioThrottleReadIopsDevice": {
122-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioThrottleReadIopsDevice",
122+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioThrottleReadIopsDevice",
123123
"oneOf": [
124124
{
125125
"type": "array",
@@ -133,7 +133,7 @@
133133
]
134134
},
135135
"blkioThrottleWriteIopsDevice": {
136-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioThrottleWriteIopsDevice",
136+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioThrottleWriteIopsDevice",
137137
"oneOf": [
138138
{
139139
"type": "array",
@@ -147,7 +147,7 @@
147147
]
148148
},
149149
"blkioWeightDevice": {
150-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeightDevice",
150+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/blockIO/blkioWeightDevice",
151151
"type": "array",
152152
"items": {
153153
"$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"
@@ -156,45 +156,45 @@
156156
}
157157
},
158158
"cpu": {
159-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu",
159+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu",
160160
"properties": {
161161
"cpus": {
162-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/cpus",
162+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/cpus",
163163
"$ref": "defs.json#/definitions/stringPointer"
164164
},
165165
"mems": {
166-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/mems",
166+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/mems",
167167
"$ref": "defs.json#/definitions/stringPointer"
168168
},
169169
"period": {
170-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/period",
170+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/period",
171171
"$ref": "defs.json#/definitions/uint64Pointer"
172172
},
173173
"quota": {
174-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/quota",
174+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/quota",
175175
"$ref": "defs.json#/definitions/uint64Pointer"
176176
},
177177
"realtimePeriod": {
178-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/realtimePeriod",
178+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/realtimePeriod",
179179
"$ref": "defs.json#/definitions/uint64Pointer"
180180
},
181181
"realtimeRuntime": {
182-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/realtimeRuntime",
182+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/realtimeRuntime",
183183
"$ref": "defs.json#/definitions/uint64Pointer"
184184
},
185185
"shares": {
186-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/shares",
186+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/cpu/shares",
187187
"$ref": "defs.json#/definitions/uint64Pointer"
188188
}
189189
},
190190
"type": "object"
191191
},
192192
"disableOOMKiller": {
193-
"id": "https://opencontainers.org/schema/bundle/linux/resources/disableOOMKiller",
193+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/disableOOMKiller",
194194
"type": "boolean"
195195
},
196196
"hugepageLimits": {
197-
"id": "https://opencontainers.org/schema/bundle/linux/resources/hugepageLimits",
197+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/hugepageLimits",
198198
"oneOf": [
199199
{
200200
"type": "array",
@@ -216,41 +216,41 @@
216216
]
217217
},
218218
"memory": {
219-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory",
219+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/memory",
220220
"type": "object",
221221
"properties": {
222222
"kernel": {
223-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel",
223+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/memory/kernel",
224224
"$ref": "defs.json#/definitions/uint64Pointer"
225225
},
226226
"limit": {
227-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit",
227+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/memory/limit",
228228
"$ref": "defs.json#/definitions/uint64Pointer"
229229
},
230230
"reservation": {
231-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/reservation",
231+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/memory/reservation",
232232
"$ref": "defs.json#/definitions/uint64Pointer"
233233
},
234234
"swap": {
235-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/swap",
235+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/memory/swap",
236236
"$ref": "defs.json#/definitions/uint64Pointer"
237237
},
238238
"swappiness": {
239-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/swappiness",
239+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/memory/swappiness",
240240
"$ref": "defs.json#/definitions/uint64Pointer"
241241
}
242242
}
243243
},
244244
"network": {
245-
"id": "https://opencontainers.org/schema/bundle/linux/resources/network",
245+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/network",
246246
"type": "object",
247247
"properties": {
248248
"classID": {
249-
"id": "https://opencontainers.org/schema/bundle/linux/resources/network/classId",
249+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/network/classId",
250250
"$ref": "defs.json#/definitions/uint32"
251251
},
252252
"priorities": {
253-
"id": "https://opencontainers.org/schema/bundle/linux/resources/network/priorities",
253+
"id": "https://opencontainers.org/schema/runtime/config/linux/resources/network/priorities",
254254
"oneOf": [
255255
{
256256
"type": "array",
@@ -278,18 +278,18 @@
278278
]
279279
},
280280
"rootfsPropagation": {
281-
"id": "https://opencontainers.org/schema/bundle/linux/rootfsPropagation",
281+
"id": "https://opencontainers.org/schema/runtime/config/linux/rootfsPropagation",
282282
"type": "string"
283283
},
284284
"seccomp": {
285-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp",
285+
"id": "https://opencontainers.org/schema/runtime/config/linux/seccomp",
286286
"properties": {
287287
"defaultAction": {
288-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/defaultAction",
288+
"id": "https://opencontainers.org/schema/runtime/config/linux/seccomp/defaultAction",
289289
"type": "string"
290290
},
291291
"architectures": {
292-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/architectures",
292+
"id": "https://opencontainers.org/schema/runtime/config/linux/seccomp/architectures",
293293
"oneOf": [
294294
{
295295
"type": "array",
@@ -303,7 +303,7 @@
303303
]
304304
},
305305
"syscalls": {
306-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/syscalls",
306+
"id": "https://opencontainers.org/schema/runtime/config/linux/seccomp/syscalls",
307307
"type": "array",
308308
"items": {
309309
"$ref": "defs-linux.json#/definitions/Syscall"
@@ -313,7 +313,7 @@
313313
"type": "object"
314314
},
315315
"sysctl": {
316-
"id": "https://opencontainers.org/schema/bundle/linux/sysctl",
316+
"id": "https://opencontainers.org/schema/runtime/config/linux/sysctl",
317317
"oneOf": [
318318
{
319319
"$ref": "defs.json#/definitions/mapStringString"
@@ -324,15 +324,15 @@
324324
]
325325
},
326326
"maskedPaths": {
327-
"id": "https://opencontainers.org/schema/bundle/linux/maskedPaths",
327+
"id": "https://opencontainers.org/schema/runtime/config/linux/maskedPaths",
328328
"$ref": "defs.json#/definitions/ArrayOfStrings"
329329
},
330330
"readonlyPaths": {
331-
"id": "https://opencontainers.org/schema/bundle/linux/readonlyPaths",
331+
"id": "https://opencontainers.org/schema/runtime/config/linux/readonlyPaths",
332332
"$ref": "defs.json#/definitions/ArrayOfStrings"
333333
},
334334
"mountLabel": {
335-
"id": "https://opencontainers.org/schema/bundle/linux/mountLabel",
335+
"id": "https://opencontainers.org/schema/runtime/config/linux/mountLabel",
336336
"type": "string"
337337
}
338338
}

‎schema/schema-solaris.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
22
"solaris": {
33
"description": "Solaris platform-specific configurations",
4-
"id": "https://opencontainers.org/schema/bundle/solaris",
4+
"id": "https://opencontainers.org/schema/runtime/config/solaris",
55
"type": "object",
66
"properties": {
77
"milestone": {
8-
"id": "https://opencontainers.org/schema/bundle/solaris/milestone",
8+
"id": "https://opencontainers.org/schema/runtime/config/solaris/milestone",
99
"type": "string"
1010
},
1111
"limitpriv": {
12-
"id": "https://opencontainers.org/schema/bundle/solaris/limitpriv",
12+
"id": "https://opencontainers.org/schema/runtime/config/solaris/limitpriv",
1313
"type": "string"
1414
},
1515
"maxShmMemory": {
16-
"id": "https://opencontainers.org/schema/bundle/solaris/maxShmMemory",
16+
"id": "https://opencontainers.org/schema/runtime/config/solaris/maxShmMemory",
1717
"type": "string"
1818
},
1919
"cappedCPU": {
20-
"id": "https://opencontainers.org/schema/bundle/solaris/cappedCPU",
20+
"id": "https://opencontainers.org/schema/runtime/config/solaris/cappedCPU",
2121
"$ref": "defs.json#/definitions/mapStringString"
2222
},
2323
"cappedMemory": {
24-
"id": "https://opencontainers.org/schema/bundle/solaris/cappedMemory",
24+
"id": "https://opencontainers.org/schema/runtime/config/solaris/cappedMemory",
2525
"$ref": "defs.json#/definitions/mapStringString"
2626
},
2727
"anet": {
28-
"id": "https://opencontainers.org/schema/bundle/solaris/anet",
28+
"id": "https://opencontainers.org/schema/runtime/config/solaris/anet",
2929
"type": "array",
3030
"items": {
3131
"$ref": "defs.json#/definitions/mapStringString"

0 commit comments

Comments
 (0)