Skip to content

Commit 520c634

Browse files
tianontianon
authored
Merge pull request #945 from wking/json-schema-minimal-ids
schema: Completely drop our JSON Schema 'id' properties
2 parents b2d941e + 4e5a137 commit 520c634

File tree

5 files changed

+0
-124
lines changed

5 files changed

+0
-124
lines changed

‎schema/config-linux.json

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
{
22
"linux": {
33
"description": "Linux platform-specific configurations",
4-
"id": "https://opencontainers.org/schema/bundle/linux",
54
"type": "object",
65
"properties": {
76
"devices": {
8-
"id": "https://opencontainers.org/schema/bundle/linux/devices",
97
"type": "array",
108
"items": {
119
"$ref": "defs-linux.json#/definitions/Device"
1210
}
1311
},
1412
"uidMappings": {
15-
"id": "https://opencontainers.org/schema/bundle/linux/uidMappings",
1613
"type": "array",
1714
"items": {
1815
"$ref": "defs.json#/definitions/IDMapping"
1916
}
2017
},
2118
"gidMappings": {
22-
"id": "https://opencontainers.org/schema/bundle/linux/gidMappings",
2319
"type": "array",
2420
"items": {
2521
"$ref": "defs.json#/definitions/IDMapping"
2622
}
2723
},
2824
"namespaces": {
29-
"id": "https://opencontainers.org/schema/bundle/linux/namespaces",
3025
"type": "array",
3126
"items": {
3227
"anyOf": [
@@ -37,22 +32,18 @@
3732
}
3833
},
3934
"resources": {
40-
"id": "https://opencontainers.org/schema/bundle/linux/resources",
4135
"type": "object",
4236
"properties": {
4337
"devices": {
44-
"id": "https://opencontainers.org/schema/bundle/linux/resources/devices",
4538
"type": "array",
4639
"items": {
4740
"$ref": "defs-linux.json#/definitions/DeviceCgroup"
4841
}
4942
},
5043
"pids": {
51-
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids",
5244
"type": "object",
5345
"properties": {
5446
"limit": {
55-
"id": "https://opencontainers.org/schema/bundle/linux/resources/pids/limit",
5647
"$ref": "defs.json#/definitions/int64"
5748
}
5849
},
@@ -61,47 +52,39 @@
6152
]
6253
},
6354
"blockIO": {
64-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO",
6555
"type": "object",
6656
"properties": {
6757
"weight": {
68-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/weight",
6958
"$ref": "defs-linux.json#/definitions/weight"
7059
},
7160
"leafWeight": {
72-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/leafWeight",
7361
"$ref": "defs-linux.json#/definitions/weight"
7462
},
7563
"throttleReadBpsDevice": {
76-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleReadBpsDevice",
7764
"type": "array",
7865
"items": {
7966
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
8067
}
8168
},
8269
"throttleWriteBpsDevice": {
83-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleWriteBpsDevice",
8470
"type": "array",
8571
"items": {
8672
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
8773
}
8874
},
8975
"throttleReadIOPSDevice": {
90-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleReadIOPSDevice",
9176
"type": "array",
9277
"items": {
9378
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
9479
}
9580
},
9681
"throttleWriteIOPSDevice": {
97-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/throttleWriteIOPSDevice",
9882
"type": "array",
9983
"items": {
10084
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
10185
}
10286
},
10387
"weightDevice": {
104-
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/weightDevice",
10588
"type": "array",
10689
"items": {
10790
"$ref": "defs-linux.json#/definitions/blockIODeviceWeight"
@@ -110,41 +93,32 @@
11093
}
11194
},
11295
"cpu": {
113-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu",
11496
"type": "object",
11597
"properties": {
11698
"cpus": {
117-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/cpus",
11899
"type": "string"
119100
},
120101
"mems": {
121-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/mems",
122102
"type": "string"
123103
},
124104
"period": {
125-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/period",
126105
"$ref": "defs.json#/definitions/uint64"
127106
},
128107
"quota": {
129-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/quota",
130108
"$ref": "defs.json#/definitions/int64"
131109
},
132110
"realtimePeriod": {
133-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/realtimePeriod",
134111
"$ref": "defs.json#/definitions/uint64"
135112
},
136113
"realtimeRuntime": {
137-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/realtimeRuntime",
138114
"$ref": "defs.json#/definitions/int64"
139115
},
140116
"shares": {
141-
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/shares",
142117
"$ref": "defs.json#/definitions/uint64"
143118
}
144119
}
145120
},
146121
"hugepageLimits": {
147-
"id": "https://opencontainers.org/schema/bundle/linux/resources/hugepageLimits",
148122
"type": "array",
149123
"items": {
150124
"type": "object",
@@ -163,49 +137,38 @@
163137
}
164138
},
165139
"memory": {
166-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory",
167140
"type": "object",
168141
"properties": {
169142
"kernel": {
170-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel",
171143
"$ref": "defs.json#/definitions/int64"
172144
},
173145
"kernelTCP": {
174-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernelTCP",
175146
"$ref": "defs.json#/definitions/int64"
176147
},
177148
"limit": {
178-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit",
179149
"$ref": "defs.json#/definitions/int64"
180150
},
181151
"reservation": {
182-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/reservation",
183152
"$ref": "defs.json#/definitions/int64"
184153
},
185154
"swap": {
186-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/swap",
187155
"$ref": "defs.json#/definitions/int64"
188156
},
189157
"swappiness": {
190-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/swappiness",
191158
"$ref": "defs.json#/definitions/uint64"
192159
},
193160
"disableOOMKiller": {
194-
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/disableOOMKiller",
195161
"type": "boolean"
196162
}
197163
}
198164
},
199165
"network": {
200-
"id": "https://opencontainers.org/schema/bundle/linux/resources/network",
201166
"type": "object",
202167
"properties": {
203168
"classID": {
204-
"id": "https://opencontainers.org/schema/bundle/linux/resources/network/classId",
205169
"$ref": "defs.json#/definitions/uint32"
206170
},
207171
"priorities": {
208-
"id": "https://opencontainers.org/schema/bundle/linux/resources/network/priorities",
209172
"type": "array",
210173
"items": {
211174
"$ref": "defs-linux.json#/definitions/NetworkInterfacePriority"
@@ -216,30 +179,24 @@
216179
}
217180
},
218181
"cgroupsPath": {
219-
"id": "https://opencontainers.org/schema/bundle/linux/cgroupsPath",
220182
"type": "string"
221183
},
222184
"rootfsPropagation": {
223-
"id": "https://opencontainers.org/schema/bundle/linux/rootfsPropagation",
224185
"$ref": "defs-linux.json#/definitions/RootfsPropagation"
225186
},
226187
"seccomp": {
227-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp",
228188
"type": "object",
229189
"properties": {
230190
"defaultAction": {
231-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/defaultAction",
232191
"$ref": "defs-linux.json#/definitions/SeccompAction"
233192
},
234193
"architectures": {
235-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/architectures",
236194
"type": "array",
237195
"items": {
238196
"$ref": "defs-linux.json#/definitions/SeccompArch"
239197
}
240198
},
241199
"syscalls": {
242-
"id": "https://opencontainers.org/schema/bundle/linux/seccomp/syscalls",
243200
"type": "array",
244201
"items": {
245202
"$ref": "defs-linux.json#/definitions/Syscall"
@@ -251,27 +208,21 @@
251208
]
252209
},
253210
"sysctl": {
254-
"id": "https://opencontainers.org/schema/bundle/linux/sysctl",
255211
"$ref": "defs.json#/definitions/mapStringString"
256212
},
257213
"maskedPaths": {
258-
"id": "https://opencontainers.org/schema/bundle/linux/maskedPaths",
259214
"$ref": "defs.json#/definitions/ArrayOfStrings"
260215
},
261216
"readonlyPaths": {
262-
"id": "https://opencontainers.org/schema/bundle/linux/readonlyPaths",
263217
"$ref": "defs.json#/definitions/ArrayOfStrings"
264218
},
265219
"mountLabel": {
266-
"id": "https://opencontainers.org/schema/bundle/linux/mountLabel",
267220
"type": "string"
268221
},
269222
"intelRdt": {
270-
"id": "https://opencontainers.org/schema/bundle/linux/intelRdt",
271223
"type": "object",
272224
"properties": {
273225
"l3CacheSchema": {
274-
"id": "https://opencontainers.org/schema/bundle/linux/intelRdt/l3CacheSchema",
275226
"type": "string"
276227
}
277228
}

0 commit comments

Comments
 (0)