Make experimental a runtime flag

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

command/plugin/cmd.go

@@ -1,13 +1,33 @@
-// +build !experimental
-
 package plugin
 
 import (
+	"fmt"
+
+	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
 // NewPluginCommand returns a cobra command for `plugin` subcommands
 func NewPluginCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{}
+	cmd := &cobra.Command{
+		Use:   "plugin",
+		Short: "Manage plugins",
+		Args:  cli.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
+		},
+	}
+
+	cmd.AddCommand(
+		newDisableCommand(dockerCli),
+		newEnableCommand(dockerCli),
+		newInspectCommand(dockerCli),
+		newInstallCommand(dockerCli),
+		newListCommand(dockerCli),
+		newRemoveCommand(dockerCli),
+		newSetCommand(dockerCli),
+		newPushCommand(dockerCli),
+	)
+	return cmd
 }

command/plugin/cmd_experimental.go

@@ -1,35 +0,0 @@
-// +build experimental
-
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-// NewPluginCommand returns a cobra command for `plugin` subcommands
-func NewPluginCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "plugin",
-		Short: "Manage plugins",
-		Args:  cli.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
-		},
-	}
-
-	cmd.AddCommand(
-		newDisableCommand(dockerCli),
-		newEnableCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newInstallCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newSetCommand(dockerCli),
-		newPushCommand(dockerCli),
-	)
-	return cmd
-}

command/plugin/disable.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/enable.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/inspect.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/install.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/list.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/push.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/remove.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (

command/plugin/set.go

@@ -1,5 +1,3 @@
-// +build experimental
-
 package plugin
 
 import (