mirror of https://github.com/docker/cli.git
Disable `docker system dial-stdio` on Windows
The `conn` here is `*winio.win32MessageBytePipe` which does not have a `CloseRead` method (it does have `CloseWrite`) resulting in: docker@WIN-NUC0 C:\Users\docker>.\docker-windows-amd64.exe system dial-stdio the raw stream connection does not implement halfCloser Also disable the path which uses this for cli-plugins on Windows. Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
parent
8ddde26af6
commit
c41c23813c
|
@ -4,6 +4,7 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/docker/cli/cli"
|
"github.com/docker/cli/cli"
|
||||||
|
@ -74,7 +75,11 @@ 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)
|
||||||
err = options.dockerCli.Initialize(options.opts, withPluginClientConn(options.name))
|
var initopts []command.InitializeOpt
|
||||||
|
if runtime.GOOS != "windows" {
|
||||||
|
initopts = append(initopts, withPluginClientConn(options.name))
|
||||||
|
}
|
||||||
|
err = options.dockerCli.Initialize(options.opts, initopts...)
|
||||||
})
|
})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
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"
|
||||||
|
@ -19,8 +21,12 @@ func NewSystemCommand(dockerCli command.Cli) *cobra.Command {
|
||||||
NewInfoCommand(dockerCli),
|
NewInfoCommand(dockerCli),
|
||||||
newDiskUsageCommand(dockerCli),
|
newDiskUsageCommand(dockerCli),
|
||||||
newPruneCommand(dockerCli),
|
newPruneCommand(dockerCli),
|
||||||
newDialStdioCommand(dockerCli),
|
|
||||||
)
|
)
|
||||||
|
if runtime.GOOS != "windows" {
|
||||||
|
cmd.AddCommand(
|
||||||
|
newDialStdioCommand(dockerCli),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue