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

schema: fix items based on latest spec 

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Ma Shimiao 2017-01-12 19:13:43 +08:00
parent 6ff6acd35b
commit 5076439d49
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
schema/config-linux.json
View File

@ -245,6 +245,10 @@
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel", "id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernel",
"$ref": "defs.json#/definitions/int64Pointer" "$ref": "defs.json#/definitions/int64Pointer"
}, },
"kernelTCP": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/kernelTCP",
"$ref": "defs.json#/definitions/int64Pointer"
},
"limit": { "limit": {
"id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit", "id": "https://opencontainers.org/schema/bundle/linux/resources/memory/limit",
"$ref": "defs.json#/definitions/int64Pointer" "$ref": "defs.json#/definitions/int64Pointer"

24
schema/defs-linux.json
View File

@ -96,9 +96,6 @@
"minimum": 0, "minimum": 0,
"maximum": 512 "maximum": 512
}, },
"FilePermissions": {
"type": "string"
},
"FileType": { "FileType": {
"description": "Type of a block or special character device", "description": "Type of a block or special character device",
"type": "string", "type": "string",
@ -116,9 +113,6 @@
"type": { "type": {
"$ref": "#/definitions/FileType" "$ref": "#/definitions/FileType"
}, },
"permissions": {
"$ref": "#/definitions/FilePermissions"
},
"path": { "path": {
"$ref": "defs.json#/definitions/FilePath" "$ref": "defs.json#/definitions/FilePath"
}, },
@ -132,10 +126,24 @@
"$ref": "#/definitions/Minor" "$ref": "#/definitions/Minor"
}, },
"uid": { "uid": {
"$ref": "defs.json#/definitions/UID" "oneOf": [
{
"$ref": "defs.json#/definitions/UID"
},
{
"type": "null"
}
]
}, },
"gid": { "gid": {
"$ref": "defs.json#/definitions/GID" "oneOf": [
{
"$ref": "defs.json#/definitions/GID"
},
{
"type": "null"
}
]
} }
} }
}, },