Bladeren bron

fix(nginx): improve execCommand to set working directory for Nginx execution #1046

Jacky 5 dagen geleden
bovenliggende
commit
b055c548fb
2 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 1 1
      internal/nginx/config_args.go
  2. 4 1
      internal/nginx/exec.go

+ 1 - 1
internal/nginx/config_args.go

@@ -41,7 +41,7 @@ func getNginxExeDir() string {
 
 func getNginxV() string {
 	exePath := getNginxExePath()
-	out, err := exec.Command(exePath, "-V").CombinedOutput()
+	out, err := execCommand(exePath, "-V")
 	if err != nil {
 		logger.Error(err)
 		return ""

+ 4 - 1
internal/nginx/exec.go

@@ -18,7 +18,10 @@ func execCommand(name string, cmd ...string) (stdOut string, stdErr error) {
 		cmd = append([]string{name}, cmd...)
 		stdOut, stdErr = docker.Exec(context.Background(), cmd)
 	case false:
-		bytes, err := exec.Command(name, cmd...).CombinedOutput()
+		execCmd := exec.Command(name, cmd...)
+		// fix #1046
+		execCmd.Dir = getNginxExeDir()
+		bytes, err := execCmd.CombinedOutput()
 		stdOut = string(bytes)
 		if err != nil {
 			stdErr = err