Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| ... | ... |
@@ -35,7 +35,7 @@ var ( |
| 35 | 35 |
flSocketGroup = flag.String([]string{"G", "-group"}, "docker", "Group to assign the unix socket specified by -H when running in daemon mode\nuse '' (the empty string) to disable setting of a group")
|
| 36 | 36 |
flLogLevel = flag.String([]string{"l", "-log-level"}, "info", "Set the logging level")
|
| 37 | 37 |
flEnableCors = flag.Bool([]string{"#api-enable-cors", "-api-enable-cors"}, false, "Enable CORS headers in the remote API")
|
| 38 |
- flTls = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by tls-verify flags")
|
|
| 38 |
+ flTls = flag.Bool([]string{"-tls"}, false, "Use TLS; implied by --tlsverify=true")
|
|
| 39 | 39 |
flTlsVerify = flag.Bool([]string{"-tlsverify"}, dockerTlsVerify, "Use TLS and verify the remote (daemon: verify client, client: verify daemon)")
|
| 40 | 40 |
|
| 41 | 41 |
// these are initialized in init() below since their default values depend on dockerCertPath which isn't fully initialized until init() runs |
| ... | ... |
@@ -84,7 +84,7 @@ expect an integer, and they can only be specified once. |
| 84 | 84 |
-s, --storage-driver="" Force the Docker runtime to use a specific storage driver |
| 85 | 85 |
--selinux-enabled=false Enable selinux support. SELinux does not presently support the BTRFS storage driver |
| 86 | 86 |
--storage-opt=[] Set storage driver options |
| 87 |
- --tls=false Use TLS; implied by tls-verify flags |
|
| 87 |
+ --tls=false Use TLS; implied by --tlsverify=true |
|
| 88 | 88 |
--tlscacert="/home/sven/.docker/ca.pem" Trust only remotes providing a certificate signed by the CA given here |
| 89 | 89 |
--tlscert="/home/sven/.docker/cert.pem" Path to TLS certificate file |
| 90 | 90 |
--tlskey="/home/sven/.docker/key.pem" Path to TLS key file |