Skip to content

Commit 75d4c25

Browse files
author
zhouhao
committed
schema: Update the json file
Signed-off-by: zhouhao <[email protected]>
1 parent 319fb0a commit 75d4c25

File tree

3 files changed

+76
-71
lines changed

3 files changed

+76
-71
lines changed

schema/defs-descriptor.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,44 @@
1919
"format": "uri"
2020
}
2121
},
22+
"platform": {
23+
"id": "https://opencontainers.org/schema/image/descriptor/platform",
24+
"type": "object",
25+
"required": [
26+
"architecture",
27+
"os"
28+
],
29+
"properties": {
30+
"architecture": {
31+
"id": "https://opencontainers.org/schema/image/descriptor/platform/architecture",
32+
"type": "string"
33+
},
34+
"os": {
35+
"id": "https://opencontainers.org/schema/image/descriptor/platform/os",
36+
"type": "string"
37+
},
38+
"os.version": {
39+
"id": "https://opencontainers.org/schema/image/descriptor/platform/os.version",
40+
"type": "string"
41+
},
42+
"os.features": {
43+
"id": "https://opencontainers.org/schema/image/descriptor/platform/os.features",
44+
"type": "array",
45+
"items": {
46+
"type": "string"
47+
}
48+
},
49+
"variant": {
50+
"type": "string"
51+
},
52+
"features": {
53+
"type": "array",
54+
"items": {
55+
"type": "string"
56+
}
57+
}
58+
}
59+
},
2260
"annotations": {
2361
"id": "https://opencontainers.org/schema/image/descriptor/annotations",
2462
"$ref": "defs.json#/definitions/mapStringString"

schema/fs.go

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ var _escData = map[string]*_escFile{
205205
"/config-schema.json": {
206206
local: "config-schema.json",
207207
size: 2771,
208-
modtime: 1489007060,
208+
modtime: 1491372287,
209209
compressed: `
210210
H4sIAAAJbogA/+RWQW/bPAy9+1cYbo9t/R2+U67dbgMyINh2KIZAsemEnSVqFD3MGPLfB8vJZtmym3XI
211211
aScDFB/f4xMl60eSplkJrmC0gmSyVZqtLZhHMqLQAKePZCrcpxsLBVZYKJ9118FuXXEArTrIQcSu8vzZ
@@ -223,7 +223,7 @@ b1D07fCyW0vviMlWxN4UcYpZ/Enjdtf+RQ3SGiZ/vj8oANpKu/UTMV9kR1SDMjPzGZ6y5MQwnZvwWfX7
223223
"/content-descriptor.json": {
224224
local: "content-descriptor.json",
225225
size: 1091,
226-
modtime: 1489085976,
226+
modtime: 1491372287,
227227
compressed: `
228228
H4sIAAAJbogA/5yTwW7UMBCG73mKUVqpl27NoeIQVb3AnQPcEAevPY6nJLYZz6oE1HdHjrNsAoiFve2O
229229
/m/mm2j8vQFoLWbDlIRiaDto3yUMb2IQTQEZyi8MAm+XUGR4n9CQI6Nn4ra0uM7G46gL7kVSp9RTjmFX
@@ -237,23 +237,26 @@ NOoeV4ev1v0uEFzj1bNZXFvGLwdiLGIff30365vdnk4D8Kl5aX4EAAD//4LEuuxDBAAA
237237

238238
"/defs-descriptor.json": {
239239
local: "defs-descriptor.json",
240-
size: 906,
241-
modtime: 1489085976,
240+
size: 1966,
241+
modtime: 1491372287,
242242
compressed: `
243-
H4sIAAAJbogA/6STT2/TQBDF7/kUwzaih8Rx4YCEVVVC9M6hnKjSaro79k7x/tHuRCVU+e5obTdJi0Cg
244-
Hmx5RzPvze9p/TgDUIayThyFg1cNqEtq2XM5ZYiYhPWmxwQS4Esk/zl4QfaU4HIaCwmuImluWeOgsRxF
245-
9yqqgeIDoBwZxq/bSPsSgGJTXK1IzE1dh0heP3nkVUhdnbUlhzU77Kg2e9f6oLZ80pJRW2VJ7LtDPaII
246-
pQHv5vpT9Q2rn2fVx/Xh883J/G11c7tarB/Plu/ef9jV/9Y2V4PFbnRShjvKckz3IlyxBDpto4QuYbSs
247-
QVvS3/PGwTgLoYXSFO7uScsS2A/HCQBOzy1me9GcW/qBhjQ77KfJi9P/zGFEul2sqvWiucaqLayLF0Sb
248-
1Oe/8CD0PC5dGqFNwcGDZW1BLOeJAhxu4Y7AhAffBzRkft8UU8LtocxC7tj3z0wAqg3JYUldbRKrqb57
249-
hoHeB8Hn1/E1d+9Yb7/0PFFb9Ay1eXWfgz+pj36D2mG8GnYf31POs/LsZr8CAAD//1ayPsKKAwAA
243+
H4sIAAAJbogA/7SVT1PbMBDF73yKrWDKIX9Me+hMMwwznXLvgZ7KBGaR19HSWFJXMjRl/N07ihPbCYSh
244+
NNzitfT2/Z680cMBgMopaGEf2Vk1AXVOBVtOTwE8SmRdzVEgOvjmyX51NiJbEjhfbXMCF540F6xxqTFs
245+
RFsVNYHUB0CVlDN+X3hqSwCK89TVxOjDJMucJ6vXPcLYySwL2lCJGZc4oyxvu2ad2nCtFRttFaKwnXV1
246+
jzGSLPGuLr+MfuDoz8no87T7+e7w6P3o6no8mD6cDD98/FRnL1t2pJYt6qaTynlGIfbptsKNhkDLwkc3
247+
E/SGNWhD+meoSmj2gisgLXI3t6TjENguH1cAcHxqMJizyamh35iT5hLnq51nx/+YQ4N0PRiPpoPJJY6K
248+
xDrYIqpkHp7hQZhzYzothEJcCfeGtYFoOKwooMQF3BDk7t7OHeaUP3aKIrjoyhyp7PfdzQSgCiclptRV
249+
JaxW9XoDw88xpmV7+fBasUcUDW9XF/pVsVBqdNn5RdGGI+lYCfU5XFibn3YnJs6TRKatNDY0+m/2AZbt
250+
cPj4FNpX9SbH3h258Bof4zuS0Hyqe/fTar/GV0GYsn2ToDrxJ51tTho8PW3PsqyHa5vrDoXRxm2ml0Sy
251+
K483Mv3kfwRa6yJuXln/cyR9vXaej4SKpJdTEca3wdnDrHdVZiX6i6Xxi579ZLM+qA/+BgAA//+NODnR
252+
rgcAAA==
250253
`,
251254
},
252255

253256
"/defs.json": {
254257
local: "defs.json",
255258
size: 1670,
256-
modtime: 1489007060,
259+
modtime: 1491372287,
257260
compressed: `
258261
H4sIAAAJbogA/7STza6bMBCF9zzFyO2S9oJtbGDb7hMpy6oLSiaJq2AjY6RWEe9e8RNChFuJKneRgGc8
259262
3zmeMbcAgByxKa2qnTKa5EC+4klp1a8aaBs8grtY054vpnXgLgi7GvUXo12hNFo41FiqkyqLoTwceTOA
@@ -267,41 +270,39 @@ fIvD7in0ryMEy+fK1G6UfmdTE+tvpoL+1wV/AgAA//96IpqyhgYAAA==
267270

268271
"/image-index-schema.json": {
269272
local: "image-index-schema.json",
270-
size: 3157,
271-
modtime: 1489085976,
273+
size: 2107,
274+
modtime: 1491372287,
272275
compressed: `
273-
H4sIAAAJbogA/7yWz27bOBDG736KgRIglyRcLII9GEEuu5ec9tCglyKHCTmyJrVIlaSTuIXfvSBp2ZIo
274-
u4lq9GYPOd98vxH//ZgBFIqctNx4NrqYQ/F/Q/pfoz2yJgv3NS4I7rWiN/jUkOSSJcaplyH33MmKagx5
275-
lffNXIhnZ/RVil4buxDKYumv/roRKXaW8li1KW4uhGlIy7aki2lptuBQXnAonxL9uqGQap6eSfoUa6xp
276-
yHomV8whIAEUKf8zWZewUjinfajYQcm0VOASHjnwFUGsDLEyJDF4SWqADlADa08LstFCVJ7AJPo2d1It
277-
ZVajZs31qi7m8Pc+hm9tLIY2aaSoUXNJzrsufquM1uK6491T3Z33YZy22H/b9pq96fGvth2x9G3FlkKt
278-
L7toME+K8SGkXXbDjr8PIooX5HyxCz12xEcWRibfH8gXSFgLcXZgAFPGxWGpJEtakoIMKYqcWypDtqLS
279-
XaldT67D7jgTikrWHCo4sXfSUdjk0O/xGSYCa3hae3KTvI4YZO3/uTlsbtv/99iTdt14s7DYVCxBViS/
280-
ulUNSaG1mzxeBozwt0HvyWq4uK3QVXfz24reUJHkGpfbzLuL6d0frp4h3couh2snZ0NYcgII06G0pobX
281-
imUFPpwuiQhqXMMTgTKvemlQkZruOro66LlZoi+NrXPfH9vSO52Bz4ObGY5s6DiGVlbsSfqVpUEeQGF6
282-
TL2dDEd3c66dj0+mF0dNd9rhvGW9KAYTNmOYp7Rn3GlMXb9kd+UpzO1kT2OyJAzf4dQt3Osesdm/Mrtl
283-
s8vz3ZAAm19iv6Bl1PkRO6mHxxv4h1Fnh/71DzTU2vj46Bw5iz/2zffHquiqTj6JuyKzMZb216b3NBsn
284-
mvSCHMP4HYBgNNrMT/Ji7LXaeWbOAB5nm9nPAAAA//+x+RVQVQwAAA==
276+
H4sIAAAJbogA/6SVP2/bMBDFd3+KgxIgSxIWRdBBCLK0S6YODboUGWjyZF4q/ilJN3YLf/eCpCXLlgwk
277+
6pac7r37Pfok/l0AVBKD8OQiWVPVUH11aD5bEzkZ9PCo+Qrh0UjcwDeHghoSPLdeJ+1lEAo1TzoVo6sZ
278+
ewnW3JTqrfUrJj1v4s2HO1ZqF0VHspOEmjHr0IhuZMiy0s0ojWeUxhdh3DpMUrt8QRFLzXnr0EfCUNWQ
279+
IgFURf8dfSixSnmc9klRgIawlRBKPAwQFUKeDHkyFDP4XdyAB+AGyERcoc8I2XlGJnaM2Vt1KUczNBnS
280+
a13V8PFQ45uulku78qTS3FCDIYZh/M6Ze8+3A/aIetj37jjdsC/747UH6Olfbf/E4681eUyzfvTVBI+S
281+
+FOSXQ/Lgf6cVCStMMSqLz0PzCcWY2R//GC8IGkXcnfKALbJy+GxQY9GoIRRpGxy6bFJaolNuJH9mdym
282+
t+OCSWzIUJoQ2IFk4LAbh34LZ2oEMrDcRgyzWCcAycRPd+fh9uf/Fjzhty7aledOkQChUPwMaw3FocMt
283+
jNcpRvrX8RjRG7i6Vzyoh/pe4YZLFKR5u1c+XM0//dPtOU239u3p7oyzcWipBEjt0Hir4VWRUBDT16Uk
284+
As23sESQ9tW0lkuU86kz1Vlm1/LYWK/H3O97pQ8IrLecjdw7nMXmxtiYr5aJE59NPnSdDT80GfIvTv/a
285+
HX2ApxPNuiemYvxPgASaMccf4GrqThpcJguA58Vu8S8AAP//NlOuVTsIAAA=
285286
`,
286287
},
287288

288289
"/image-layout-schema.json": {
289290
local: "image-layout-schema.json",
290-
size: 414,
291-
modtime: 1485388791,
291+
size: 439,
292+
modtime: 1491372287,
292293
compressed: `
293-
H4sIAAAJbogA/2yPwUrEMBCG732KIXq0TQVPue5pQdiD4EU8xHa2zWKTOJkKi/TdJZlWD91TmD/z8c3/
294-
UwGoHlNHLrILXhlQp4j+EDxb55HgONkB4dlew8zw0o04WfWQqfskgwE1Mkej9SUFX0vaBBp0T/bMdfuk
295-
JbsTzvUbkozWIaLvNlkqmGxrl8X1ZxELydeImQ0fF+zWLFKISOwwKQO5TTZkUi5+RUpSS/72bb9lA8IZ
296-
eEQ4HY6wMxdusycm54f/HP08KQNv6wygHpu2adU6v5d3qQCWcjDh1+wI+z/k1rlV5pbqNwAA//8bwMuB
297-
ngEAAA==
294+
H4sIAAAJbogA/2yPQUvEMBCF7/0VQ/Sg4DYVPOW6pwVhD4IX8VDTaTvLNonJVFik/12SaRXRU5g38+W9
295+
91kBqA6TjRSYvFMG1DGg23vHLTmMcJjaAeGxvfiZ4cmOOLXqLlPXSQYDamQORutT8m4nau3joLvY9rxr
296+
HrRoV8JRtyHJaO0DOruZpYLJtaZsrM/FWEi+BMysfzuhXbUQfcDIhEkZyG2yQyYl8TPGJLVk97fth1yA
297+
74FHhOP+8LvyDbmy8JZ2EgZ6OuNtsS8fbrESR3LDj45unpSBl3UGUPd1UzdqnV/Lu1QAS2kS8X2miN03
298+
8l+PKnNL9RUAAP//k31n5bcBAAA=
298299
`,
299300
},
300301

301302
"/image-manifest-schema.json": {
302303
local: "image-manifest-schema.json",
303304
size: 921,
304-
modtime: 1489085976,
305+
modtime: 1491372287,
305306
compressed: `
306307
H4sIAAAJbogA/5ySMW8iMRCF+/0VI0MJ+O501bZXUZxSJEoTpXB2x7uDWNsZmygo4r9HtnHAkCKifTvv
307308
zTdv/dEAiB59x+QCWSNaEHcOzT9rgiKDDOtJDQj/lSGNPsC9w440dSpNL6J97rsRJxWtYwiulXLjrVlm
@@ -315,6 +316,6 @@ Dj+ZAwAA
315316

316317
"/": {
317318
isDir: true,
318-
local: "",
319+
local: "/",
319320
},
320321
}

schema/image-index-schema.json

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,42 +39,8 @@
3939
"$ref": "defs-descriptor.json#/definitions/urls"
4040
},
4141
"platform": {
42-
"id": "https://opencontainers.org/schema/image/platform",
43-
"type": "object",
44-
"required": [
45-
"architecture",
46-
"os"
47-
],
48-
"properties": {
49-
"architecture": {
50-
"id": "https://opencontainers.org/schema/image/platform/architecture",
51-
"type": "string"
52-
},
53-
"os": {
54-
"id": "https://opencontainers.org/schema/image/platform/os",
55-
"type": "string"
56-
},
57-
"os.version": {
58-
"id": "https://opencontainers.org/schema/image/platform/os.version",
59-
"type": "string"
60-
},
61-
"os.features": {
62-
"id": "https://opencontainers.org/schema/image/platform/os.features",
63-
"type": "array",
64-
"items": {
65-
"type": "string"
66-
}
67-
},
68-
"variant": {
69-
"type": "string"
70-
},
71-
"features": {
72-
"type": "array",
73-
"items": {
74-
"type": "string"
75-
}
76-
}
77-
}
42+
"id": "https://opencontainers.org/schema/image/descriptor/platform",
43+
"$ref": "defs-descriptor.json#/definitions/platform"
7844
},
7945
"annotations": {
8046
"id": "https://opencontainers.org/schema/image/descriptor/annotations",

0 commit comments

Comments
 (0)