Skip to content

Commit d26bdfd

Browse files
thaJeztahthaJeztah
authored
Merge pull request #2950 from tiborvass/execabs
Use golang.org/x/sys/execabs
2 parents c6bb561 + 8d199d5 commit d26bdfd

178 files changed

Lines changed: 5222 additions & 1525 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cli-plugins/manager/candidate.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package manager
22

33
import (
4-
"os/exec"
4+
exec "golang.org/x/sys/execabs"
55
)
66

77
// Candidate represents a possible plugin candidate, for mocking purposes

‎cli-plugins/manager/manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package manager
33
import (
44
"io/ioutil"
55
"os"
6-
"os/exec"
76
"path/filepath"
87
"sort"
98
"strings"
@@ -12,6 +11,7 @@ import (
1211
"github.com/docker/cli/cli/config"
1312
"github.com/fvbommel/sortorder"
1413
"github.com/spf13/cobra"
14+
exec "golang.org/x/sys/execabs"
1515
)
1616

1717
// ReexecEnvvar is the name of an ennvar which is set to the command

‎cli/command/image/build/context.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"io/ioutil"
1010
"net/http"
1111
"os"
12-
"os/exec"
1312
"path/filepath"
1413
"runtime"
1514
"strings"
@@ -24,6 +23,7 @@ import (
2423
"github.com/docker/docker/pkg/streamformatter"
2524
"github.com/docker/docker/pkg/stringid"
2625
"github.com/pkg/errors"
26+
exec "golang.org/x/sys/execabs"
2727
)
2828

2929
const (

‎cli/config/credentials/default_store.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package credentials
22

33
import (
4-
"os/exec"
4+
exec "golang.org/x/sys/execabs"
55
)
66

77
// DetectDefaultStore return the default credentials store for the platform if

‎cli/connhelper/commandconn/commandconn.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"io"
2121
"net"
2222
"os"
23-
"os/exec"
2423
"runtime"
2524
"strings"
2625
"sync"
@@ -29,6 +28,7 @@ import (
2928

3029
"github.com/pkg/errors"
3130
"github.com/sirupsen/logrus"
31+
exec "golang.org/x/sys/execabs"
3232
)
3333

3434
// New returns net.Conn

‎vendor.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ github.com/creack/pty 2a38352e8b4d7ab6c336eef107e4
1313
github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1
1414
github.com/docker/compose-on-kubernetes 78e6a00beda64ac8ccb9fec787e601fe2ce0d5bb # v0.5.0-alpha1
1515
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
16-
github.com/docker/docker f0014860c1b3345e1fcc7ed81c491298de2633fb # v20.10.1
17-
github.com/docker/docker-credential-helpers 54f0238b6bf101fc3ad3b34114cb5520beb562f5 # v0.6.3
16+
github.com/docker/docker d5209b29b9777e0b9713d87847a5dc8ce9d93da6
17+
github.com/docker/docker-credential-helpers 38bea2ce277ad0c9d2a6230692b0606ca5286526
1818
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.
1919
github.com/docker/go-connections 7395e3f8aa162843a74ed6d48e79627d9792ac55 # v0.4.0
2020
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
@@ -79,7 +79,7 @@ golang.org/x/crypto c1f2f97bffc9c53fc40a1a28a5b4
7979
golang.org/x/net ab34263943818b32f575efc978a3d24e80b04bd7
8080
golang.org/x/oauth2 bf48bf16ab8d622ce64ec6ce98d2c98f916b6303
8181
golang.org/x/sync cd5d95a43a6e21273425c7ae415d3df9ea832eeb
82-
golang.org/x/sys eeed37f84f13f52d35e095e8023ba65671ff86a1
82+
golang.org/x/sys b64e53b001e413bd5067f36d4e439eded3827374
8383
golang.org/x/term f5c789dd3221ff39d752ac54467d762de7cfbec6
8484
golang.org/x/text 23ae387dee1f90d29a23c0e87ee0b46038fbed0e # v0.3.3
8585
golang.org/x/time 555d28b269f0569763d25dbe1a237ae74c6bcc82

‎vendor/github.com/docker/docker-credential-helpers/client/command.go‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker-credential-helpers/go.mod‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker-credential-helpers/osxkeychain/osxkeychain_darwin.go‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker/builder/remotecontext/git/gitutils.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)