perform better environment setting

Signed-off-by: Chris Kim <[email protected]>
rancher · Mar 17, 2021 · d41c0ad · d41c0ad
1 parent cb2edd9
commit d41c0ad
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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()