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 <wking@tremily.us>
This commit is contained in:
W. Trevor King 2016-06-06 09:54:28 -07:00
parent 28cbd4dd8e
commit a3126aa342
2 changed files with 11 additions and 9 deletions

View File

@ -24,15 +24,7 @@
}
},
"annotations": {
"id": "https://opencontainers.org/schema/bundle/annotations",
"oneOf": [
{
"$ref": "defs.json#/definitions/mapStringString"
},
{
"type": "null"
}
]
"$ref": "defs.json#/definitions/annotations"
},
"hostname": {
"id": "https://opencontainers.org/schema/bundle/hostname",

View File

@ -159,6 +159,16 @@
"ociVersion": {
"description": "The version of Open Container Runtime Specification that the document complies with",
"type": "string"
},
"annotations": {
"oneOf": [
{
"$ref": "#/definitions/mapStringString"
},
{
"type": "null"
}
]
}
}
}