jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

schema: Remove string pointers 

Catch up with 868e6310 (Remove string pointers, 2017-01-12, #653).

Signed-off-by: W. Trevor King <wking@tremily.us>
This commit is contained in:
W. Trevor King 2017-01-12 15:27:56 -08:00
parent f298e10fd4
commit 83200898a1
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
schema/config-linux.json
View File

@ -179,11 +179,11 @@
"properties": {
"cpus": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/cpus",
"$ref": "defs.json#/definitions/stringPointer"
"$ref": "defs.json#/definitions/string"
},
"mems": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/mems",
"$ref": "defs.json#/definitions/stringPointer"
"$ref": "defs.json#/definitions/string"
},
"period": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/cpu/period",
@ -290,14 +290,8 @@
}
},
"cgroupsPath": {
"oneOf": [
{
"type": "null"
},
{
"type": "string"
}
]
"id": "https://opencontainers.org/schema/bundle/linux/cgroupsPath",
"$ref": "defs.json#/definitions/string"
},
"rootfsPropagation": {
"id": "https://opencontainers.org/schema/bundle/linux/rootfsPropagation",

4
schema/defs-linux.json
View File

@ -230,7 +230,7 @@
"type": "boolean"
},
"type": {
"$ref": "defs.json#/definitions/stringPointer"
"$ref": "defs.json#/definitions/string"
},
"major": {
"oneOf": [
@ -253,7 +253,7 @@
]
},
"access": {
"$ref": "defs.json#/definitions/stringPointer"
"$ref": "defs.json#/definitions/string"
}
},
"required": [

10
schema/defs.json
View File

@ -86,16 +86,6 @@
}
]
},
"stringPointer": {
"oneOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"mapStringString": {
"type": "object",
"patternProperties": {