From 0449ad8d06829459f367e51e85aef36b14bdceac Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 11 Mar 2019 15:44:58 +0000 Subject: [PATCH] Revert "Disable `docker system dial-stdio` on Windows" This reverts commit c41c23813c15219a78e4c2451f83bcdb74c6e071. This case is now handled due to the previous commit. Signed-off-by: Ian Campbell --- cli-plugins/plugin/plugin.go | 7 +------ cli/command/system/cmd.go | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/cli-plugins/plugin/plugin.go b/cli-plugins/plugin/plugin.go index c8e4f9f465..99ef36d845 100644 --- a/cli-plugins/plugin/plugin.go +++ b/cli-plugins/plugin/plugin.go @@ -4,7 +4,6 @@ import ( "encoding/json" "fmt" "os" - "runtime" "sync" "github.com/docker/cli/cli" @@ -75,11 +74,7 @@ func PersistentPreRunE(cmd *cobra.Command, args []string) error { } // flags must be the original top-level command flags, not cmd.Flags() options.opts.Common.SetDefaultOptions(options.flags) - var initopts []command.InitializeOpt - if runtime.GOOS != "windows" { - initopts = append(initopts, withPluginClientConn(options.name)) - } - err = options.dockerCli.Initialize(options.opts, initopts...) + err = options.dockerCli.Initialize(options.opts, withPluginClientConn(options.name)) }) return err } diff --git a/cli/command/system/cmd.go b/cli/command/system/cmd.go index 1bb5374ccb..6accb98f0c 100644 --- a/cli/command/system/cmd.go +++ b/cli/command/system/cmd.go @@ -1,8 +1,6 @@ package system import ( - "runtime" - "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/spf13/cobra" @@ -21,12 +19,8 @@ func NewSystemCommand(dockerCli command.Cli) *cobra.Command { NewInfoCommand(dockerCli), newDiskUsageCommand(dockerCli), newPruneCommand(dockerCli), + newDialStdioCommand(dockerCli), ) - if runtime.GOOS != "windows" { - cmd.AddCommand( - newDialStdioCommand(dockerCli), - ) - } return cmd }