Merge pull request #2950 from tiborvass/execabs

Use golang.org/x/sys/execabs
docker · Jan 27, 2021 · d26bdfd · d26bdfd
2 parents c6bb561 + 8d199d5
commit d26bdfd
Show file tree

Hide file tree

Showing 178 changed files with 5,222 additions and 1,525 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,6 @@ package manager
 import (
  "io/ioutil"
  "os"
- "os/exec"
  "path/filepath"
  "sort"
  "strings"
@@ -12,6 +11,7 @@ import (
  "github.com/docker/cli/cli/config"
  "github.com/fvbommel/sortorder"
  "github.com/spf13/cobra"
+ exec "golang.org/x/sys/execabs"
 )
 
 // ReexecEnvvar is the name of an ennvar which is set to the command

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

diff --git a/vendor.conf b/vendor.conf
@@ -13,8 +13,8 @@ github.com/creack/pty 2a38352e8b4d7ab6c336eef107e4
 github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1
 github.com/docker/compose-on-kubernetes 78e6a00beda64ac8ccb9fec787e601fe2ce0d5bb # v0.5.0-alpha1
 github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
-github.com/docker/docker f0014860c1b3345e1fcc7ed81c491298de2633fb # v20.10.1
-github.com/docker/docker-credential-helpers 54f0238b6bf101fc3ad3b34114cb5520beb562f5 # v0.6.3
+github.com/docker/docker d5209b29b9777e0b9713d87847a5dc8ce9d93da6
+github.com/docker/docker-credential-helpers 38bea2ce277ad0c9d2a6230692b0606ca5286526
 github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 # Contains a customized version of canonical/json and is used by Notary. The package is periodically rebased on current Go versions.
 github.com/docker/go-connections 7395e3f8aa162843a74ed6d48e79627d9792ac55 # v0.4.0
 github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
@@ -79,7 +79,7 @@ golang.org/x/crypto c1f2f97bffc9c53fc40a1a28a5b4
 golang.org/x/net ab34263943818b32f575efc978a3d24e80b04bd7
 golang.org/x/oauth2 bf48bf16ab8d622ce64ec6ce98d2c98f916b6303
 golang.org/x/sync cd5d95a43a6e21273425c7ae415d3df9ea832eeb
-golang.org/x/sys eeed37f84f13f52d35e095e8023ba65671ff86a1
+golang.org/x/sys b64e53b001e413bd5067f36d4e439eded3827374
 golang.org/x/term f5c789dd3221ff39d752ac54467d762de7cfbec6
 golang.org/x/text 23ae387dee1f90d29a23c0e87ee0b46038fbed0e # v0.3.3
 golang.org/x/time 555d28b269f0569763d25dbe1a237ae74c6bcc82

diff --git a/vendor/github.com/docker/docker-credential-helpers/client/command.go b/vendor/github.com/docker/docker-credential-helpers/client/command.go
diff --git a/vendor/github.com/docker/docker-credential-helpers/go.mod b/vendor/github.com/docker/docker-credential-helpers/go.mod
diff --git a/vendor/github.com/docker/docker-credential-helpers/osxkeychain/osxkeychain_darwin.go b/vendor/github.com/docker/docker-credential-helpers/osxkeychain/osxkeychain_darwin.go
diff --git a/vendor/github.com/docker/docker/builder/remotecontext/git/gitutils.go b/vendor/github.com/docker/docker/builder/remotecontext/git/gitutils.go
diff --git a/vendor/github.com/docker/docker/pkg/archive/archive.go b/vendor/github.com/docker/docker/pkg/archive/archive.go
diff --git a/vendor/github.com/docker/docker/vendor.conf b/vendor/github.com/docker/docker/vendor.conf
diff --git a/vendor/golang.org/x/sys/README.md b/vendor/golang.org/x/sys/README.md
diff --git a/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s b/vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_arm64.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.s b/vendor/golang.org/x/sys/cpu/cpu_arm64.s
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go b/vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go b/vendor/golang.org/x/sys/cpu/cpu_gc_x86.go