From 9bef12dcfd4c1d83692713eea53f55a257c07f24 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 30 Aug 2016 13:36:50 +0100 Subject: [PATCH] Merge pull request #26096 from ohmystack/fix/docs-dockerd Add docs for "--containerd" in dockerd (cherry picked from commit 644cb53b41b49fd750fe9c86e922125ef8156259) Signed-off-by: Charles Smith --- docs/reference/commandline/dockerd.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 8f37c51ac7..db5cf6eb93 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -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.