Browse code

Merge pull request #5372 from SvenDowideit/docs-tweaks-to-socket-options

Docs tweaks to socket options

Sven Dowideit authored on 2014/04/25 08:08:22
Showing 3 changed files
... ...
@@ -67,7 +67,7 @@ func main() {
67 67
 	)
68 68
 	flag.Var(&flDns, []string{"#dns", "-dns"}, "Force docker to use specific DNS servers")
69 69
 	flag.Var(&flDnsSearch, []string{"-dns-search"}, "Force Docker to use specific DNS search domains")
70
-	flag.Var(&flHosts, []string{"H", "-host"}, "tcp://host:port, unix://path/to/socket, fd://* or fd://socketfd to use in daemon mode. Multiple sockets can be specified")
70
+	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.")
71 71
 
72 72
 	flag.Parse()
73 73
 
... ...
@@ -9,7 +9,7 @@ or execute `docker help`:
9 9
 
10 10
     $ sudo docker
11 11
       Usage: docker [OPTIONS] COMMAND [arg...]
12
-        -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.
12
+        -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.
13 13
 
14 14
       A self-sufficient runtime for linux containers.
15 15
 
... ...
@@ -52,7 +52,7 @@ expect an integer, and they can only be specified once.
52 52
     Usage of docker:
53 53
 
54 54
       -D, --debug=false: Enable debug mode
55
-      -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].
55
+      -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.
56 56
       -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
57 57
       --api-enable-cors=false: Enable CORS headers in the remote API
58 58
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
... ...
@@ -77,6 +77,8 @@ expect an integer, and they can only be specified once.
77 77
       --tlsverify=false: Use TLS and verify the remote (daemon: verify client, client: verify daemon)
78 78
       --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
79 79
 
80
+    Options with [] may be specified multiple times.
81
+
80 82
 The Docker daemon is the persistent process that manages containers.
81 83
 Docker uses the same binary for both the daemon and client. To run the
82 84
 daemon you provide the `-d` flag.
... ...
@@ -12,7 +12,7 @@ To list available commands, either run ``docker`` with no parameters or execute
12 12
 
13 13
   $ sudo docker
14 14
     Usage: docker [OPTIONS] COMMAND [arg...]
15
-      -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.
15
+      -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.
16 16
 
17 17
     A self-sufficient runtime for linux containers.
18 18
 
... ...
@@ -65,8 +65,8 @@ only be specified once.
65 65
 
66 66
     Usage of docker:
67 67
       -D, --debug=false: Enable debug mode
68
-      -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].
69 68
       -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
69
+      -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.
70 70
       --api-enable-cors=false: Enable CORS headers in the remote API
71 71
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
72 72
       -bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b
... ...
@@ -90,6 +90,8 @@ only be specified once.
90 90
       --tlsverify=false: Use TLS and verify the remote (daemon: verify client, client: verify daemon)
91 91
       --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
92 92
 
93
+    Options with [] may be specified multiple times.
94
+
93 95
 The Docker daemon is the persistent process that manages containers.  Docker uses the same binary for both the
94 96
 daemon and client.  To run the daemon you provide the ``-d`` flag.
95 97