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

fix blkio related validation 

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Ma Shimiao 2016-08-29 11:58:16 +08:00
parent aad1f38ce8
commit a04cce97ea
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
schema/config-linux.json
View File

@ -113,7 +113,7 @@
"type": "array",
"items": [
{
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
}
]
},
@ -128,7 +128,7 @@
{
"type": "array",
"items": {
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
}
},
{
@ -142,7 +142,7 @@
{
"type": "array",
"items": {
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
}
},
{
@ -156,7 +156,7 @@
{
"type": "array",
"items": {
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
"$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
}
},
{
@ -168,7 +168,7 @@
"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeightDevice",
"type": "array",
"items": {
"$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"
"$ref": "defs-linux.json#/definitions/blockIODeviceWeight"
}
}
}

22
schema/defs-linux.json
View File

@ -188,16 +188,6 @@
}
]
},
"blockIODeviceWeightPointer": {
"oneOf": [
{
"$ref": "#/definitions/blockIODeviceWeight"
},
{
"type": "null"
}
]
},
"blockIODeviceThrottle": {
"allOf": [
{
@ -207,22 +197,12 @@
"type": "object",
"properties": {
"rate": {
"$ref": "defs.json#/definitions/uint64Pointer"
"$ref": "defs.json#/definitions/uint64"
}
}
}
]
},
"blockIODeviceThrottlePointer": {
"oneOf": [
{
"$ref": "#/definitions/blockIODeviceThrottle"
},
{
"type": "null"
}
]
},
"DeviceCgroup": {
"type": "object",
"properties": {