Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Disable `docker system dial-stdio` on Windows" 

This reverts commit c41c23813c.

This case is now handled due to the previous commit.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2019-03-11 15:44:58 +00:00
parent 186e7456ac
commit 0449ad8d06
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli-plugins/plugin/plugin.go
View File

@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
"runtime"
"sync" "sync"
"github.com/docker/cli/cli" "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() // flags must be the original top-level command flags, not cmd.Flags()
options.opts.Common.SetDefaultOptions(options.flags) options.opts.Common.SetDefaultOptions(options.flags)
var initopts []command.InitializeOpt err = options.dockerCli.Initialize(options.opts, withPluginClientConn(options.name))
if runtime.GOOS != "windows" {
initopts = append(initopts, withPluginClientConn(options.name))
}
err = options.dockerCli.Initialize(options.opts, initopts...)
}) })
return err return err
} }

6
cli/command/system/cmd.go
View File

@ -1,8 +1,6 @@
package system package system
import ( import (
"runtime"
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -21,12 +19,8 @@ func NewSystemCommand(dockerCli command.Cli) *cobra.Command {
NewInfoCommand(dockerCli), NewInfoCommand(dockerCli),
newDiskUsageCommand(dockerCli), newDiskUsageCommand(dockerCli),
newPruneCommand(dockerCli), newPruneCommand(dockerCli),
)
if runtime.GOOS != "windows" {
cmd.AddCommand(
newDialStdioCommand(dockerCli), newDialStdioCommand(dockerCli),
) )
}
return cmd return cmd
} }