From d41c0ad18f172ad19355801f959ba75683c86a53 Mon Sep 17 00:00:00 2001 From: Chris Kim Date: Wed, 17 Mar 2021 13:48:27 -0700 Subject: [PATCH] perform better environment setting Signed-off-by: Chris Kim --- pkg/applyinator/applyinator.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/applyinator/applyinator.go b/pkg/applyinator/applyinator.go index 6934a9ad..ecabea8a 100644 --- a/pkg/applyinator/applyinator.go +++ b/pkg/applyinator/applyinator.go @@ -65,8 +65,9 @@ func (a *Applyinator) execute(ctx context.Context, directory string, instruction } cmd := exec.CommandContext(ctx, instruction.Command, instruction.Args...) logrus.Infof("Running command: %s %v", instruction.Command, instruction.Args) - cmd.Env = append(os.Environ(), instruction.Env...) - cmd.Env = append(os.Environ(), fmt.Sprintf("CATTLE_AGENT_EXECUTION_PWD=%s", directory)) + cmd.Env = os.Environ() + cmd.Env = append(cmd.Env, instruction.Env...) + cmd.Env = append(cmd.Env, fmt.Sprintf("CATTLE_AGENT_EXECUTION_PWD=%s", directory)) cmd.Env = append(cmd.Env, "PATH="+os.Getenv("PATH")+":"+directory) stdout, err := cmd.StdoutPipe()