Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cli-plugins/manager/candidate.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package manager

import (
exec "golang.org/x/sys/execabs"
)
import "os/exec"

// Candidate represents a possible plugin candidate, for mocking purposes
type Candidate interface {
Expand Down
2 changes: 1 addition & 1 deletion cli-plugins/manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package manager
import (
"context"
"os"
"os/exec"
"path/filepath"
"sort"
"strings"
Expand All @@ -13,7 +14,6 @@ import (
"github.com/fvbommel/sortorder"
"github.com/spf13/cobra"
"golang.org/x/sync/errgroup"
exec "golang.org/x/sys/execabs"
)

// ReexecEnvvar is the name of an ennvar which is set to the command
Expand Down
2 changes: 1 addition & 1 deletion cli/command/image/build/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"io"
"net/http"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
Expand All @@ -22,7 +23,6 @@ import (
"github.com/docker/docker/pkg/stringid"
"github.com/moby/patternmatcher"
"github.com/pkg/errors"
exec "golang.org/x/sys/execabs"
)

const (
Expand Down
4 changes: 1 addition & 3 deletions cli/config/credentials/default_store.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package credentials

import (
exec "golang.org/x/sys/execabs"
)
import "os/exec"

// DetectDefaultStore return the default credentials store for the platform if
// no user-defined store is passed, and the store executable is available.
Expand Down
2 changes: 1 addition & 1 deletion cli/connhelper/commandconn/commandconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"io"
"net"
"os"
"os/exec"
"runtime"
"strings"
"sync"
Expand All @@ -28,7 +29,6 @@ import (

"github.com/pkg/errors"
"github.com/sirupsen/logrus"
exec "golang.org/x/sys/execabs"
)

// New returns net.Conn
Expand Down