Forráskód Böngészése

add a reference to multiple -H options, and update the other example of -H option

and copy changes to the cli.md file

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Sven Dowideit 11 éve
szülő
commit
b2c87fe08b

+ 1 - 1
docker/docker.go

@@ -67,7 +67,7 @@ func main() {
 	)
 	)
 	flag.Var(&flDns, []string{"#dns", "-dns"}, "Force docker to use specific DNS servers")
 	flag.Var(&flDns, []string{"#dns", "-dns"}, "Force docker to use specific DNS servers")
 	flag.Var(&flDnsSearch, []string{"-dns-search"}, "Force Docker to use specific DNS search domains")
 	flag.Var(&flDnsSearch, []string{"-dns-search"}, "Force Docker to use specific DNS search domains")
-	flag.Var(&flHosts, []string{"H", "-host"}, "The socket to bind to in daemon mode, specified using tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.")
+	flag.Var(&flHosts, []string{"H", "-host"}, "The socket(s) to bind to in daemon mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.")
 
 
 	flag.Parse()
 	flag.Parse()
 
 

+ 4 - 2
docs/sources/reference/commandline/cli.md

@@ -9,7 +9,7 @@ no parameters or execute `docker help`:
 
 
     $ sudo docker
     $ sudo docker
       Usage: docker [OPTIONS] COMMAND [arg...]
       Usage: docker [OPTIONS] COMMAND [arg...]
-        -H=[unix:///var/run/docker.sock]: tcp://[host]:port to bind/connect to or unix://[/path/to/socket] to use. When host=[127.0.0.1] is omitted for tcp or path=[/var/run/docker.sock] is omitted for unix sockets, default values are used.
+        -H, --host=[]: The socket(s) to bind to in daemon mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
 
 
       A self-sufficient runtime for linux containers.
       A self-sufficient runtime for linux containers.
 
 
@@ -53,7 +53,7 @@ expect an integer, and they can only be specified once.
 
 
     Usage of docker:
     Usage of docker:
       -D, --debug=false: Enable debug mode
       -D, --debug=false: Enable debug mode
-      -H, --host=[]: Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise. systemd socket activation can be used with fd://[socketfd].
+      -H, --host=[]: The socket(s) to bind to in daemon mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
       -G, --group="docker": Group to assign the unix socket specified by -H when running in daemon mode; use '' (the empty string) to disable setting of a group
       -G, --group="docker": Group to assign the unix socket specified by -H when running in daemon mode; use '' (the empty string) to disable setting of a group
       --api-enable-cors=false: Enable CORS headers in the remote API
       --api-enable-cors=false: Enable CORS headers in the remote API
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
@@ -78,6 +78,8 @@ expect an integer, and they can only be specified once.
       --tlsverify=false: Use TLS and verify the remote (daemon: verify client, client: verify daemon)
       --tlsverify=false: Use TLS and verify the remote (daemon: verify client, client: verify daemon)
       --mtu=0: Set the containers network MTU; if no value is provided: default to the default route MTU or 1500 if no default route is available
       --mtu=0: Set the containers network MTU; if no value is provided: default to the default route MTU or 1500 if no default route is available
 
 
+    Options with [] may be specified multiple times.
+
 The Docker daemon is the persistent process that manages containers.
 The Docker daemon is the persistent process that manages containers.
 Docker uses the same binary for both the daemon and client. To run the
 Docker uses the same binary for both the daemon and client. To run the
 daemon you provide the `-d` flag.
 daemon you provide the `-d` flag.

+ 3 - 3
docs/sources/reference/commandline/cli.rst

@@ -12,7 +12,7 @@ To list available commands, either run ``docker`` with no parameters or execute
 
 
   $ sudo docker
   $ sudo docker
     Usage: docker [OPTIONS] COMMAND [arg...]
     Usage: docker [OPTIONS] COMMAND [arg...]
-      -H=[unix:///var/run/docker.sock]: tcp://[host]:port to bind/connect to or unix://[/path/to/socket] to use. When host=[127.0.0.1] is omitted for tcp or path=[/var/run/docker.sock] is omitted for unix sockets, default values are used.
+      -H, --host=[]: The socket(s) to bind to in daemon mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
 
 
     A self-sufficient runtime for linux containers.
     A self-sufficient runtime for linux containers.
 
 
@@ -63,10 +63,10 @@ only be specified once.
 
 
 ::
 ::
 
 
-    Usage:
+    Usage of docker:
       -D, --debug=false: Enable debug mode
       -D, --debug=false: Enable debug mode
       -G, --group="docker": Group to assign the unix socket specified by -H when running in daemon mode; use '' (the empty string) to disable setting of a group
       -G, --group="docker": Group to assign the unix socket specified by -H when running in daemon mode; use '' (the empty string) to disable setting of a group
-      -H, --host=[]: The socket to bind to in daemon mode, specified using tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
+      -H, --host=[]: The socket(s) to bind to in daemon mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
       --api-enable-cors=false: Enable CORS headers in the remote API
       --api-enable-cors=false: Enable CORS headers in the remote API
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
       -bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b
       -bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b