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

Merge pull request #1745 from ijc/disable-dial-stdio-for-plugins 

cli-plugins: disable use of dial-stdio
This commit is contained in:
Silvin Lubecki 2019-03-18 12:29:41 +01:00 committed by GitHub
parent 86a5a489f7 ff2ed6efa8
commit cfd5b16ae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,11 @@ func runPlugin(dockerCli *command.DockerCli, plugin *cobra.Command, meta manager
PersistentPreRunE = func(_ *cobra.Command, _ []string) error { PersistentPreRunE = func(_ *cobra.Command, _ []string) error {
var err error var err error
persistentPreRunOnce.Do(func() { persistentPreRunOnce.Do(func() {
err = tcmd.Initialize(withPluginClientConn(plugin.Name())) var opts []command.InitializeOpt
if os.Getenv("DOCKER_CLI_PLUGIN_USE_DIAL_STDIO") != "" {
opts = append(opts, withPluginClientConn(plugin.Name()))
}
err = tcmd.Initialize(opts...)
}) })
return err return err
} }

6
e2e/cli-plugins/dial_test.go
View File

@ -11,7 +11,11 @@ import (
"gotest.tools/icmd" "gotest.tools/icmd"
) )
func TestDialStdio(t *testing.T) { func TestCLIPluginDialStdio(t *testing.T) {
if os.Getenv("DOCKER_CLI_PLUGIN_USE_DIAL_STDIO") == "" {
t.Skip("skipping plugin dial-stdio test since DOCKER_CLI_PLUGIN_USE_DIAL_STDIO is not set")
}
// Run the helloworld plugin forcing /bin/true as the `system // Run the helloworld plugin forcing /bin/true as the `system
// dial-stdio` target. It should be passed all arguments from // dial-stdio` target. It should be passed all arguments from
// before the `helloworld` arg, but not the --who=foo which // before the `helloworld` arg, but not the --who=foo which