浏览代码

Merge pull request #46216 from thaJeztah/23.0_backport_windows_fix_service_register

[23.0 backport] windows: fix --register-service when executed from within binary directory
Cory Snider 1 年之前
父节点
当前提交
d6cc8d1d28
共有 1 个文件被更改,包括 1 次插入10 次删除
  1. 1 10
      cmd/dockerd/service_windows.go

+ 1 - 10
cmd/dockerd/service_windows.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"time"
 
@@ -145,16 +144,8 @@ func (h *etwHook) Fire(e *logrus.Entry) error {
 	return windows.ReportEvent(h.log.Handle, etype, 0, eid, 0, count, 0, &ss[0], nil)
 }
 
-func getServicePath() (string, error) {
-	p, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		return "", err
-	}
-	return filepath.Abs(p)
-}
-
 func registerService() error {
-	p, err := getServicePath()
+	p, err := os.Executable()
 	if err != nil {
 		return err
 	}