From 7a54c7bd7bfd73304536d6858cfddf4b69eb4559 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Wed, 16 Sep 2015 10:25:38 +0800 Subject: [PATCH] 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 --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e76a826de..44c7e871f 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ user with uid and gid of `0` defined within that file-system. `config.json`: ```json { - "version": "pre-draft", + "version": "0.1.0", "platform": { "os": "linux", "arch": "amd64" @@ -144,8 +144,7 @@ user with uid and gid of `0` defined within that file-system. "CAP_AUDIT_WRITE", "CAP_KILL", "CAP_NET_BIND_SERVICE" - ], - "rootfsPropagation": "" + ] } } ``` @@ -231,7 +230,7 @@ user with uid and gid of `0` defined within that file-system. "gidMappings": null, "rlimits": [ { - "type": 7, + "type": "RLIMIT_NOFILE", "hard": 1024, "soft": 1024 } @@ -255,6 +254,9 @@ user with uid and gid of `0` defined within that file-system. "cpus": "", "mems": "" }, + "pids": { + "limit": 0 + }, "blockIO": { "blkioWeight": 0, "blkioWeightDevice": "", @@ -269,6 +271,7 @@ user with uid and gid of `0` defined within that file-system. "priorities": null } }, + "cgroupsPath": "", "namespaces": [ { "type": "pid",