Make the -h flag deprecated.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b2bb64a3800619b5810e8baf59d72613e7ccd19
Component: engine

components/engine/cli/cobraadaptor/adaptor.go

@@ -36,6 +36,9 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
 		volume.NewVolumeCommand(dockerCli),
 	)
 
+	rootCmd.PersistentFlags().BoolP("help", "h", false, "Print usage")
+	rootCmd.PersistentFlags().MarkShorthandDeprecated("help", "please use --help")
+
 	return CobraAdaptor{
 		rootCmd:   rootCmd,
 		dockerCli: dockerCli,