Hide commands and flag annotated "experimentalCLI"

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Gopkg.toml

@@ -50,7 +50,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cli"
-  revision = "6318939f30e01585b34eb6a68a54b890a8d54eb0"
+  revision = "37f9a88c696ae81be14c1697bd083d6421b4933c"
 
 [[override]]
   name = "github.com/deislabs/cnab-go"
@@ -70,7 +70,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/xeipuuv/gojsonschema"
-  version = "v1.2.0"
+  revision = "f971f3cd73b2899de6923801c147f075263e0c50"
 
 [[override]]
   name = "github.com/docker/go-metrics"

internal/commands/root.go

@@ -61,6 +61,24 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		build.Cmd(dockerCli),
 		inspectCmd(dockerCli),
 	)
+
+	if !dockerCli.ClientInfo().HasExperimental {
+		hideExperimentalFlags(cmd)
+	}
+}
+
+func hideExperimentalFlags(cmd *cobra.Command) {
+	if _, ok := cmd.Annotations["experimentalCLI"]; ok {
+		cmd.Hidden = true
+	}
+	cmd.Flags().VisitAll(func(f *pflag.Flag) {
+		if _, ok := f.Annotations["experimentalCLI"]; ok {
+			f.Hidden = true
+		}
+	})
+	for _, subcmd := range cmd.Commands() {
+		hideExperimentalFlags(subcmd)
+	}
 }
 
 func firstOrEmpty(list []string) string {