Merge pull request #26096 from ohmystack/fix/docs-dockerd

Add docs for "--containerd" in dockerd
(cherry picked from commit 644cb53b41)

Signed-off-by: Charles Smith <charles.smith@docker.com>
This commit is contained in:
Justin Cormack 2016-08-30 13:36:50 +01:00 committed by Charles Smith
parent aaa7a58c63
commit 9bef12dcfd

View file

@ -594,6 +594,14 @@ The Docker daemon relies on a
(invoked via the `containerd` daemon) as its interface to the Linux
kernel `namespaces`, `cgroups`, and `SELinux`.
By default, the Docker daemon automatically starts `containerd`. If you want to
control `containerd` startup, manually start `containerd` and pass the path to
the `containerd` socket using the `--containerd` flag. For example:
```bash
$ dockerd --containerd /var/run/dev/docker-containerd.sock
```
Runtimes can be registered with the daemon either via the
configuration file or using the `--add-runtime` command line argument.