README.md: Update the config example

* version in the config example is advanced to 0.1.0
* rootfsPropagation in config.json is removed
    (The same one is already in runtime.json)
* rlimit time is changed from magic number to name(string)
* add pids cgroup
* add cgroup path

After this change applied, the example config in this README.md
is consistent with the result of `runc spec`.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
This commit is contained in:
Lai Jiangshan
2015-09-16 10:25:38 +08:00
parent 4198b43b18
commit 7a54c7bd7b
+7 -4
View File
@@ -83,7 +83,7 @@ user with uid and gid of `0` defined within that file-system.
`config.json`: `config.json`:
```json ```json
{ {
"version": "pre-draft", "version": "0.1.0",
"platform": { "platform": {
"os": "linux", "os": "linux",
"arch": "amd64" "arch": "amd64"
@@ -144,8 +144,7 @@ user with uid and gid of `0` defined within that file-system.
"CAP_AUDIT_WRITE", "CAP_AUDIT_WRITE",
"CAP_KILL", "CAP_KILL",
"CAP_NET_BIND_SERVICE" "CAP_NET_BIND_SERVICE"
], ]
"rootfsPropagation": ""
} }
} }
``` ```
@@ -231,7 +230,7 @@ user with uid and gid of `0` defined within that file-system.
"gidMappings": null, "gidMappings": null,
"rlimits": [ "rlimits": [
{ {
"type": 7, "type": "RLIMIT_NOFILE",
"hard": 1024, "hard": 1024,
"soft": 1024 "soft": 1024
} }
@@ -255,6 +254,9 @@ user with uid and gid of `0` defined within that file-system.
"cpus": "", "cpus": "",
"mems": "" "mems": ""
}, },
"pids": {
"limit": 0
},
"blockIO": { "blockIO": {
"blkioWeight": 0, "blkioWeight": 0,
"blkioWeightDevice": "", "blkioWeightDevice": "",
@@ -269,6 +271,7 @@ user with uid and gid of `0` defined within that file-system.
"priorities": null "priorities": null
} }
}, },
"cgroupsPath": "",
"namespaces": [ "namespaces": [
{ {
"type": "pid", "type": "pid",