diff options
| author | Anusha Ragunathan <anusha@docker.com> | 2016-03-24 09:18:03 -0700 |
|---|---|---|
| committer | Tibor Vass <tibor@docker.com> | 2016-03-31 18:35:03 -0400 |
| commit | f97f3e98fc6c15042095a2c0d96170bb9580af56 (patch) | |
| tree | e56652e67842adbde78b8f2d6dfa2db5205163d5 /docs/reference/commandline | |
| parent | 7500c8cc7288bcd6f32b7fe27ff094b82d5ba528 (diff) | |
| download | docker-f97f3e98fc6c15042095a2c0d96170bb9580af56.tar.gz | |
When using systemd, pass expected cgroupsPath and cli options to runc.
runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName
format and the "--systemd-cgroup" option to be set. Update docker accordingly.
Fixes 21475
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6)
Diffstat (limited to 'docs/reference/commandline')
| -rw-r--r-- | docs/reference/commandline/daemon.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 5ca4df782f..5ca00242c7 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -491,12 +491,13 @@ with the `--exec-opt` flag. All the flag's options have the `native` prefix. A single `native.cgroupdriver` option is available. The `native.cgroupdriver` option specifies the management of the container's -cgroups. You can specify only specify `cgroupfs` at the moment. If you omit the +cgroups. You can specify only specify `cgroupfs` or `systemd`. If you specify +`systemd` and it is not available, the system errors out. If you omit the `native.cgroupdriver` option,` cgroupfs` is used. -This example explicitely sets the `cgroupdriver` to `cgroupfs`: +This example sets the `cgroupdriver` to `systemd`: - $ sudo docker daemon --exec-opt native.cgroupdriver=cgroupfs + $ sudo docker daemon --exec-opt native.cgroupdriver=systemd Setting this option applies to all containers the daemon launches. |