Browse code

fix(docs): fixup based on changes in master

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)

Brandon Philips authored on 2014/01/22 05:47:27
Showing 2 changed files
... ...
@@ -43,7 +43,7 @@ func main() {
43 43
 		flMtu                = flag.Int([]string{"#mtu", "-mtu"}, docker.DefaultNetworkMtu, "Set the containers network mtu")
44 44
 	)
45 45
 	flag.Var(&flDns, []string{"#dns", "-dns"}, "Force docker to use specific DNS servers")
46
-	flag.Var(&flHosts, []string{"H", "-host"}, "Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise")
46
+	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")
47 47
 
48 48
 	flag.Parse()
49 49
 
... ...
@@ -27,7 +27,7 @@ To list available commands, either run ``docker`` with no parameters or execute
27 27
 
28 28
     Usage of docker:
29 29
       -D, --debug=false: Enable debug mode
30
-      -H, --host=[]: Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise
30
+      -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].
31 31
       --api-enable-cors=false: Enable CORS headers in the remote API
32 32
       -b, --bridge="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
33 33
       --bip="": Use this CIDR notation address for the network bridge's IP, not compatible with -b
... ...
@@ -63,6 +63,8 @@ the ``-H`` flag for the client.
63 63
         # both are equal
64 64
 
65 65
 
66
+To run the daemon with socket activation, use ``docker -d -H fd://*``. Individual sockets can also be specified ``docker -d -H fd://3``.
67
+
66 68
 .. _cli_attach:
67 69
 
68 70
 ``attach``