Skip to content

Internalize vendor/github.com/docker/machine #21647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Internalize vendor/github.com/docker/machine #21647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130c636
Internalize vendor/github.com/docker/machine
afbjorklund Sep 25, 2025
3eafd42
Add license boilerplate to the machine files
afbjorklund Oct 1, 2025
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
2 changes: 1 addition & 1 deletion cmd/drivers/hyperkit/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"os"

"github.com/docker/machine/libmachine/drivers/plugin"
"k8s.io/minikube/pkg/libmachine/drivers/plugin"
"k8s.io/minikube/pkg/drivers/hyperkit"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/drivers/kvm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"os"

"github.com/docker/machine/libmachine/drivers/plugin"
"k8s.io/minikube/pkg/libmachine/drivers/plugin"
"k8s.io/minikube/pkg/drivers/kvm"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/minikube/cmd/config/profile_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/minikube/pkg/minikube/reason"
"k8s.io/minikube/pkg/minikube/style"

"github.com/docker/machine/libmachine"
"k8s.io/minikube/pkg/libmachine"
"github.com/olekukonko/tablewriter"
"github.com/olekukonko/tablewriter/tw"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"strings"
"time"

"github.com/docker/machine/libmachine/mcnerror"
"k8s.io/minikube/pkg/libmachine/mcnerror"
"github.com/mitchellh/go-ps"
"github.com/pkg/errors"

"github.com/docker/machine/libmachine"
"k8s.io/minikube/pkg/libmachine"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/klog/v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/minikube/cmd/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"testing"

"github.com/docker/machine/libmachine"
"k8s.io/minikube/pkg/libmachine"
"github.com/google/go-cmp/cmp"
"github.com/otiai10/copy"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion cmd/minikube/cmd/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package cmd
import (
"os"

"github.com/docker/machine/libmachine/state"
"k8s.io/minikube/pkg/libmachine/state"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/klog/v2"
Expand Down
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/podman-env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"os/exec"
"strings"

"github.com/docker/machine/libmachine/drivers"
"github.com/docker/machine/libmachine/ssh"
"k8s.io/minikube/pkg/libmachine/drivers"
"k8s.io/minikube/pkg/libmachine/ssh"
"github.com/spf13/cobra"
"k8s.io/minikube/pkg/drivers/kic/oci"
"k8s.io/minikube/pkg/minikube/command"
Expand Down
2 changes: 1 addition & 1 deletion cmd/minikube/cmd/podman-env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"bytes"
"testing"

"github.com/docker/machine/libmachine/ssh"
"k8s.io/minikube/pkg/libmachine/ssh"
"github.com/google/go-cmp/cmp"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/minikube/cmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/Delta456/box-cli-maker/v2"
"github.com/blang/semver/v4"
"github.com/docker/go-connections/nat"
"github.com/docker/machine/libmachine/ssh"
"k8s.io/minikube/pkg/libmachine/ssh"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1/remote"
Expand Down
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"text/template"
"time"

"github.com/docker/machine/libmachine"
"github.com/docker/machine/libmachine/state"
"k8s.io/minikube/pkg/libmachine"
"k8s.io/minikube/pkg/libmachine/state"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/klog/v2"
Expand Down
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/stop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"runtime"
"time"

"github.com/docker/machine/libmachine"
"github.com/docker/machine/libmachine/mcnerror"
"k8s.io/minikube/pkg/libmachine"
"k8s.io/minikube/pkg/libmachine/mcnerror"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion cmd/minikube/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
// Force exp dependency
_ "golang.org/x/exp/ebnf"

mlog "github.com/docker/machine/libmachine/log"
mlog "k8s.io/minikube/pkg/libmachine/log"

"github.com/google/slowjam/pkg/stacklog"
"github.com/pkg/profile"
Expand Down
21 changes: 7 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
cloud.google.com/go/storage v1.56.1
github.com/Delta456/box-cli-maker/v2 v2.3.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0
github.com/Parallels/docker-machine-parallels/v2 v2.0.1
github.com/VividCortex/godaemon v1.0.0
github.com/Xuanwo/go-locale v1.1.3
github.com/aregm/cpuid v0.0.0-20181003105527-1a4a6f06a1c6
github.com/blang/semver/v4 v4.0.0
github.com/briandowns/spinner v1.23.2
github.com/cenkalti/backoff/v4 v4.3.0
Expand All @@ -22,7 +22,6 @@ require (
github.com/docker/docker v28.3.3+incompatible
github.com/docker/go-connections v0.6.0
github.com/docker/go-units v0.5.0
github.com/docker/machine v0.16.2
github.com/elazarl/goproxy v1.7.2
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/google/go-cmp v0.7.0
Expand All @@ -32,6 +31,8 @@ require (
github.com/google/uuid v1.6.0
github.com/hashicorp/go-getter v1.8.0
github.com/hashicorp/go-retryablehttp v0.7.8
github.com/hashicorp/go-version v1.6.0
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95
github.com/hooklift/iso9660 v1.0.0
github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0
github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f
Expand All @@ -40,12 +41,12 @@ require (
github.com/juju/mutex/v2 v2.0.0
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/klauspost/cpuid v1.2.0
github.com/machine-drivers/docker-machine-driver-vmware v0.1.5
github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24
github.com/mattn/go-isatty v0.0.20
github.com/mitchellh/go-ps v1.0.0
github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14
github.com/moby/patternmatcher v0.6.0
github.com/moby/term v0.5.0
github.com/olekukonko/tablewriter v1.0.9
github.com/opencontainers/cgroups v0.0.4
github.com/opencontainers/go-digest v1.0.0
Expand All @@ -56,6 +57,7 @@ require (
github.com/pkg/profile v1.7.0
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
github.com/sayboras/dockerclient v1.0.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.9
Expand Down Expand Up @@ -103,7 +105,6 @@ require (
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/aregm/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 // indirect
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
github.com/aws/aws-sdk-go-v2/config v1.29.15 // indirect
Expand Down Expand Up @@ -163,18 +164,18 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
github.com/gookit/color v1.5.2 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect
github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/errors v0.0.0-20220203013757-bd733f3c86b9 // indirect
github.com/juju/loggo v1.0.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand All @@ -192,7 +193,6 @@ require (
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/user v0.4.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
Expand All @@ -212,7 +212,6 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
github.com/sayboras/dockerclient v1.0.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
Expand Down Expand Up @@ -254,9 +253,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
github.com/Parallels/docker-machine-parallels/v2 => github.com/minikube-machine/machine-driver-parallels/v2 v2.0.2-0.20240730142131-ada9375ea417
github.com/docker/machine => github.com/minikube-machine/machine v0.0.0-20240815173309-ffb6b643c381
github.com/machine-drivers/docker-machine-driver-vmware => github.com/minikube-machine/machine-driver-vmware v0.1.6-0.20230701123042-a391c48b14d5
)
Loading
Loading