Merge pull request #11121 from shishir-a412ed/docker_help_issue

Fix: docker -d -h start daemon instead of showing help menu
2015-03-02 15:40:27 -08:00 · 2015-03-02 15:40:27 -08:00 · 8e107a9321
parent 32ccde46dd 0ab28c6589
commit 8e107a9321
1 changed files with 4 additions and 0 deletions
--- a/docker/docker.go
+++ b/docker/docker.go
@ -70,6 +70,10 @@ func main() {
 	setDefaultConfFlag(flTrustKey, defaultTrustKeyFile)

 	if *flDaemon {
+		if *flHelp {
+			flag.Usage()
+			return
+		}
 		mainDaemon()
 		return
 	}