Skip to content

Commit

Permalink
Merge pull request #5047 from vvoland/v26.1-5038
Browse files Browse the repository at this point in the history
[26.1 backport] cli-plugins: PluginRunCommand: use cmd.Environ instead of os.Environ
  • Loading branch information
vvoland authored Apr 30, 2024
2 parents 6c2b06d + 1c6a8ec commit 4cf5afa
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions cli-plugins/manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ func PluginRunCommand(dockerCli command.Cli, name string, rootcmd *cobra.Command
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr

cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, ReexecEnvvar+"="+os.Args[0])
cmd.Env = append(cmd.Environ(), ReexecEnvvar+"="+os.Args[0])
cmd.Env = appendPluginResourceAttributesEnvvar(cmd.Env, rootcmd, plugin)

return cmd, nil
Expand Down

0 comments on commit 4cf5afa

Please sign in to comment.