Pārlūkot izejas kodu

Merge pull request #21576 from albers/docs-daemon--containerd

docs for `docker daemon --containerd`
Vincent Demeester 9 gadi atpakaļ
vecāks
revīzija
b9d59e86d3
2 mainītis faili ar 8 papildinājumiem un 3 dzēšanām
  1. 4 3
      docs/reference/commandline/daemon.md
  2. 4 0
      man/docker-daemon.8.md

+ 4 - 3
docs/reference/commandline/daemon.md

@@ -21,13 +21,14 @@ weight = -1
       -b, --bridge=""                        Attach containers to a network bridge
       --bip=""                               Specify network bridge IP
       --cgroup-parent=                       Set parent cgroup for all containers
-      -D, --debug                            Enable debug mode
-      --default-gateway=""                   Container default gateway IPv4 address
-      --default-gateway-v6=""                Container default gateway IPv6 address
       --cluster-store=""                     URL of the distributed storage backend
       --cluster-advertise=""                 Address of the daemon instance on the cluster
       --cluster-store-opt=map[]              Set cluster options
       --config-file=/etc/docker/daemon.json  Daemon configuration file
+      --containerd                           Path to containerd socket
+      -D, --debug                            Enable debug mode
+      --default-gateway=""                   Container default gateway IPv4 address
+      --default-gateway-v6=""                Container default gateway IPv6 address
       --dns=[]                               DNS server to use
       --dns-opt=[]                           DNS options to use
       --dns-search=[]                        DNS search domains to use

+ 4 - 0
man/docker-daemon.8.md

@@ -15,6 +15,7 @@ docker-daemon - Enable daemon mode
 [**--cluster-advertise**[=*[]*]]
 [**--cluster-store-opt**[=*map[]*]]
 [**--config-file**[=*/etc/docker/daemon.json*]]
+[**--containerd**[=*SOCKET-PATH*]]
 [**-D**|**--debug**]
 [**--default-gateway**[=*DEFAULT-GATEWAY*]]
 [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
@@ -101,6 +102,9 @@ format.
 **--config-file**="/etc/docker/daemon.json"
   Specifies the JSON file path to load the configuration from.
 
+**--containerd**=""
+  Path to containerd socket.
+
 **-D**, **--debug**=*true*|*false*
   Enable debug mode. Default is false.