Merge pull request #11121 from shishir-a412ed/docker_help_issue

Fix: docker -d -h start daemon instead of showing help menu Upstream-commit: 8e107a93210c54f22ec1354d969c771b1abfbe05 Component: engine
2015-03-02 15:40:27 -08:00
parent 2d25573473 cbc491abc7
commit d146803485
1 changed files with 4 additions and 0 deletions
@@ -70,6 +70,10 @@ func main() {
 	setDefaultConfFlag(flTrustKey, defaultTrustKeyFile)

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