Browse code

docs for `docker daemon --containerd`

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 75f0015c50fef03067c5d54097fb6eb8cb62200b)

Harald Albers authored on 2016/03/28 20:47:24
Showing 2 changed files
... ...
@@ -21,13 +21,14 @@ weight = -1
21 21
       -b, --bridge=""                        Attach containers to a network bridge
22 22
       --bip=""                               Specify network bridge IP
23 23
       --cgroup-parent=                       Set parent cgroup for all containers
24
-      -D, --debug                            Enable debug mode
25
-      --default-gateway=""                   Container default gateway IPv4 address
26
-      --default-gateway-v6=""                Container default gateway IPv6 address
27 24
       --cluster-store=""                     URL of the distributed storage backend
28 25
       --cluster-advertise=""                 Address of the daemon instance on the cluster
29 26
       --cluster-store-opt=map[]              Set cluster options
30 27
       --config-file=/etc/docker/daemon.json  Daemon configuration file
28
+      --containerd                           Path to containerd socket
29
+      -D, --debug                            Enable debug mode
30
+      --default-gateway=""                   Container default gateway IPv4 address
31
+      --default-gateway-v6=""                Container default gateway IPv6 address
31 32
       --dns=[]                               DNS server to use
32 33
       --dns-opt=[]                           DNS options to use
33 34
       --dns-search=[]                        DNS search domains to use
... ...
@@ -15,6 +15,7 @@ docker-daemon - Enable daemon mode
15 15
 [**--cluster-advertise**[=*[]*]]
16 16
 [**--cluster-store-opt**[=*map[]*]]
17 17
 [**--config-file**[=*/etc/docker/daemon.json*]]
18
+[**--containerd**[=*SOCKET-PATH*]]
18 19
 [**-D**|**--debug**]
19 20
 [**--default-gateway**[=*DEFAULT-GATEWAY*]]
20 21
 [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
... ...
@@ -101,6 +102,9 @@ format.
101 101
 **--config-file**="/etc/docker/daemon.json"
102 102
   Specifies the JSON file path to load the configuration from.
103 103
 
104
+**--containerd**=""
105
+  Path to containerd socket.
106
+
104 107
 **-D**, **--debug**=*true*|*false*
105 108
   Enable debug mode. Default is false.
106 109