Browse code

Update docker manpage

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>

Ma Shimiao authored on 2015/03/13 16:28:09
Showing 1 changed files
... ...
@@ -23,34 +23,29 @@ its own man page which explain usage and arguments.
23 23
 To see the man page for a command run **man docker <command>**.
24 24
 
25 25
 # OPTIONS
26
-**-D**=*true*|*false*
27
-   Enable debug mode. Default is false.
28
-
29
-**--help**
26
+**-h**, **--help**
30 27
   Print usage statement
31 28
 
32
-**-H**, **--host**=[unix:///var/run/docker.sock]: tcp://[host:port] to bind or
33
-unix://[/path/to/socket] to use.
34
-   The socket(s) to bind to in daemon mode specified using one or more
35
-   tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
36
-
37 29
 **--api-cors-header**=""
38 30
   Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all.
39 31
 
40
-**-b**=""
32
+**-b**, **--bridge**=""
41 33
   Attach containers to a pre\-existing network bridge; use 'none' to disable container networking
42 34
 
43 35
 **--bip**=""
44 36
   Use the provided CIDR notation address for the dynamically created bridge (docker0); Mutually exclusive of \-b
45 37
 
46
-**-d**=*true*|*false*
38
+**-D**, **--debug**=*true*|*false*
39
+  Enable debug mode. Default is false.
40
+
41
+**-d**, **--daemon**=*true*|*false*
47 42
   Enable daemon mode. Default is false.
48 43
 
49 44
 **--dns**=""
50 45
   Force Docker to use specific DNS servers
51 46
 
52
-**-g**=""
53
-  Path to use as the root of the Docker runtime. Default is `/var/lib/docker`.
47
+**-e**, **--exec-driver**=""
48
+  Force Docker to use specific exec driver. Default is `native`.
54 49
 
55 50
 **--fixed-cidr**=""
56 51
   IPv4 subnet for fixed IPs (e.g., 10.20.0.0/16); this subnet must be nested in the bridge subnet (which is defined by \-b or \-\-bip)
... ...
@@ -58,6 +53,18 @@ unix://[/path/to/socket] to use.
58 58
 **--fixed-cidr-v6**=""
59 59
   IPv6 subnet for global IPv6 addresses (e.g., 2a00:1450::/64)
60 60
 
61
+**-G**, **--group**=""
62
+  Group to assign the unix socket specified by -H when running in daemon mode.
63
+  use '' (the empty string) to disable setting of a group. Default is `docker`.
64
+
65
+**-g**, **--graph**=""
66
+  Path to use as the root of the Docker runtime. Default is `/var/lib/docker`.
67
+
68
+**-H**, **--host**=[unix:///var/run/docker.sock]: tcp://[host:port] to bind or
69
+unix://[/path/to/socket] to use.
70
+  The socket(s) to bind to in daemon mode specified using one or more
71
+  tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
72
+
61 73
 **--icc**=*true*|*false*
62 74
   Allow unrestricted inter\-container and Docker daemon host communication. If disabled, containers can still be linked together using **--link** option (see **docker-run(1)**). Default is true.
63 75
 
... ...
@@ -71,7 +78,7 @@ unix://[/path/to/socket] to use.
71 71
   Enable IP masquerading for bridge's IP range. Default is true.
72 72
 
73 73
 **--iptables**=*true*|*false*
74
-  Disable Docker's addition of iptables rules. Default is true.
74
+  Enable Docker's addition of iptables rules. Default is true.
75 75
 
76 76
 **--ipv6**=*true*|*false*
77 77
   Enable IPv6 support. Default is false. Docker will create an IPv6-enabled bridge with address fe80::1 which will allow you to create IPv6-enabled containers. Use together with `--fixed-cidr-v6` to provide globally routable IPv6 addresses. IPv6 forwarding will be enabled if not used with `--ip-forward=false`. This may collide with your host's current IPv6 settings. For more information please consult the documentation about "Advanced Networking - IPv6".
... ...
@@ -83,21 +90,28 @@ unix://[/path/to/socket] to use.
83 83
   Set key=value labels to the daemon (displayed in `docker info`)
84 84
 
85 85
 **--mtu**=VALUE
86
-  Set the containers network mtu. Default is `1500`.
86
+  Set the containers network mtu. Default is `0`.
87 87
 
88
-**-p**=""
88
+**-p**, **--pidfile**=""
89 89
   Path to use for daemon PID file. Default is `/var/run/docker.pid`
90 90
 
91 91
 **--registry-mirror**=<scheme>://<host>
92 92
   Prepend a registry mirror to be used for image pulls. May be specified multiple times.
93 93
 
94
-**-s**=""
94
+**-s**, **--storage-driver**=""
95 95
   Force the Docker runtime to use a specific storage driver.
96 96
 
97 97
 **--storage-opt**=[]
98 98
   Set storage driver options. See STORAGE DRIVER OPTIONS.
99 99
 
100
-**-v**=*true*|*false*
100
+**-tls**=*true*|*false*
101
+  Use TLS; implied by --tlsverify. Default is false.
102
+
103
+**-tlsverify**=*true*|*false*
104
+  Use TLS and verify the remote (daemon: verify client, client: verify daemon).
105
+  Default is false.
106
+
107
+**-v**, **--version**=*true*|*false*
101 108
   Print version information and quit. Default is false.
102 109
 
103 110
 **--selinux-enabled**=*true*|*false*
... ...
@@ -198,6 +212,9 @@ inside it)
198 198
 **docker-start(1)**
199 199
   Start a stopped container
200 200
 
201
+**docker-stats(1)**
202
+  Display a live stream of one or more containers' resource usage statistics
203
+
201 204
 **docker-stop(1)**
202 205
   Stop a running container
203 206