Use golang.org/x/sys/execabs

Signed-off-by: Tibor Vass <tibor@docker.com>
docker · Jan 25, 2021 · 482e104 · 482e104
1 parent 98fab0b
commit 482e104
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cli-plugins/manager/candidate.go b/cli-plugins/manager/candidate.go
@@ -1,7 +1,7 @@
 package manager
 
 import (
-	"os/exec"
+	exec "golang.org/x/sys/execabs"
 )
 
 // Candidate represents a possible plugin candidate, for mocking purposes

diff --git a/cli-plugins/manager/manager.go b/cli-plugins/manager/manager.go
@@ -3,7 +3,7 @@ package manager
 import (
 	"io/ioutil"
 	"os"
-	"os/exec"
+	exec "golang.org/x/sys/execabs"
 	"path/filepath"
 	"sort"
 	"strings"

diff --git a/cli/command/image/build/context.go b/cli/command/image/build/context.go
@@ -9,7 +9,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -24,6 +23,7 @@ import (
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/pkg/errors"
+	exec "golang.org/x/sys/execabs"
 )
 
 const (

diff --git a/cli/config/credentials/default_store.go b/cli/config/credentials/default_store.go
@@ -1,7 +1,7 @@
 package credentials
 
 import (
-	"os/exec"
+	exec "golang.org/x/sys/execabs"
 )
 
 // DetectDefaultStore return the default credentials store for the platform if

diff --git a/cli/connhelper/commandconn/commandconn.go b/cli/connhelper/commandconn/commandconn.go
@@ -20,7 +20,6 @@ import (
 	"io"
 	"net"
 	"os"
-	"os/exec"
 	"runtime"
 	"strings"
 	"sync"
@@ -29,6 +28,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	exec "golang.org/x/sys/execabs"
 )
 
 // New returns net.Conn