Skip to content

Commit a9d3218

Browse files
wkingMa Shimiao
authored andcommitted
schema/defs.json: Pull annotations over from config-schema.json
So we can use it in the coming state-schema.json without duplication. I dropped the "id" because none of the other defs.json entries had an ID. Signed-off-by: W. Trevor King <[email protected]>
1 parent 2caa67d commit a9d3218

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

schema/config-schema.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,7 @@
2424
}
2525
},
2626
"annotations": {
27-
"id": "https://opencontainers.org/schema/bundle/annotations",
28-
"oneOf": [
29-
{
30-
"$ref": "defs.json#/definitions/mapStringString"
31-
},
32-
{
33-
"type": "null"
34-
}
35-
]
27+
"$ref": "defs.json#/definitions/annotations"
3628
},
3729
"hostname": {
3830
"id": "https://opencontainers.org/schema/bundle/hostname",

schema/defs.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,16 @@
159159
"ociVersion": {
160160
"description": "The version of Open Container Runtime Specification that the document complies with",
161161
"type": "string"
162+
},
163+
"annotations": {
164+
"oneOf": [
165+
{
166+
"$ref": "#/definitions/mapStringString"
167+
},
168+
{
169+
"type": "null"
170+
}
171+
]
162172
}
163173
}
164174
}

0 commit comments

Comments
 (0)