Merge pull request #5027 from laurazard/run-hooks-reexec-env-var

hooks: set expected environment when executing
docker · Apr 18, 2024 · b982833 · b982833
2 parents 78089c5 + 5011759
commit b982833
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cli-plugins/manager/plugin.go b/cli-plugins/manager/plugin.go
@@ -2,6 +2,7 @@ package manager
 
 import (
  "encoding/json"
+ "os"
  "os/exec"
  "path/filepath"
  "regexp"
@@ -113,7 +114,10 @@ func (p *Plugin) RunHook(cmdName string, flags map[string]string) ([]byte, error
  return nil, wrapAsPluginError(err, "failed to marshall hook data")
  }
 
- hookCmdOutput, err := exec.Command(p.Path, p.Name, HookSubcommandName, string(hDataBytes)).Output()
+ pCmd := exec.Command(p.Path, p.Name, HookSubcommandName, string(hDataBytes))
+ pCmd.Env = os.Environ()
+ pCmd.Env = append(pCmd.Env, ReexecEnvvar+"="+os.Args[0])
+ hookCmdOutput, err := pCmd.Output()
  if err != nil {
  return nil, wrapAsPluginError(err, "failed to execute plugin hook subcommand")
  }