diff --git a/drivers/azure/azure.go b/drivers/azure/azure.go index 6e10b051b7..e390ea670a 100644 --- a/drivers/azure/azure.go +++ b/drivers/azure/azure.go @@ -22,10 +22,6 @@ import ( "github.com/docker/machine/state" ) -const ( - dockerConfigDir = "/etc/docker" -) - type Driver struct { MachineName string SubscriptionID string diff --git a/drivers/digitalocean/digitalocean.go b/drivers/digitalocean/digitalocean.go index 30401602ae..7348af2b76 100644 --- a/drivers/digitalocean/digitalocean.go +++ b/drivers/digitalocean/digitalocean.go @@ -16,10 +16,6 @@ import ( "github.com/docker/machine/state" ) -const ( - dockerConfigDir = "/etc/docker" -) - type Driver struct { AccessToken string DropletID int @@ -330,10 +326,6 @@ func (d *Driver) Kill() error { return err } -func (d *Driver) GetDockerConfigDir() string { - return dockerConfigDir -} - func (d *Driver) getClient() *godo.Client { t := &oauth.Transport{ Token: &oauth.Token{AccessToken: d.AccessToken}, diff --git a/drivers/fakedriver/fakedriver.go b/drivers/fakedriver/fakedriver.go index 3a5fc02e0e..d7fd999154 100644 --- a/drivers/fakedriver/fakedriver.go +++ b/drivers/fakedriver/fakedriver.go @@ -1,8 +1,6 @@ package fakedriver import ( - "os/exec" - "github.com/docker/machine/drivers" "github.com/docker/machine/provider" "github.com/docker/machine/state" @@ -97,19 +95,3 @@ func (d *FakeDriver) Kill() error { func (d *FakeDriver) Upgrade() error { return nil } - -func (d *FakeDriver) StartDocker() error { - return nil -} - -func (d *FakeDriver) StopDocker() error { - return nil -} - -func (d *FakeDriver) GetDockerConfigDir() string { - return "" -} - -func (d *FakeDriver) GetSSHCommand(args ...string) (*exec.Cmd, error) { - return &exec.Cmd{}, nil -} diff --git a/drivers/google/google.go b/drivers/google/google.go index 4bb0e2cc37..85f45f0ba6 100644 --- a/drivers/google/google.go +++ b/drivers/google/google.go @@ -12,10 +12,6 @@ import ( "github.com/docker/machine/state" ) -const ( - dockerConfigDir = "/etc/docker" -) - // Driver is a struct compatible with the docker.hosts.drivers.Driver interface. type Driver struct { MachineName string diff --git a/drivers/hyperv/hyperv_windows.go b/drivers/hyperv/hyperv_windows.go index 26bdd95c57..951deb8516 100644 --- a/drivers/hyperv/hyperv_windows.go +++ b/drivers/hyperv/hyperv_windows.go @@ -18,10 +18,6 @@ import ( "github.com/docker/machine/utils" ) -const ( - dockerConfigDir = "/var/lib/boot2docker" -) - type Driver struct { SSHUser string SSHPort int diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go index a8e88d33f6..59e74836b1 100644 --- a/drivers/openstack/openstack.go +++ b/drivers/openstack/openstack.go @@ -16,10 +16,6 @@ import ( "github.com/docker/machine/state" ) -const ( - dockerConfigDir = "/etc/docker" -) - type Driver struct { AuthUrl string Insecure bool diff --git a/drivers/rackspace/rackspace.go b/drivers/rackspace/rackspace.go index 103ca357cd..ff9d0cc32b 100644 --- a/drivers/rackspace/rackspace.go +++ b/drivers/rackspace/rackspace.go @@ -9,10 +9,6 @@ import ( "github.com/docker/machine/drivers/openstack" ) -const ( - dockerConfigDir = "/etc/docker" -) - // Driver is a machine driver for Rackspace. It's a specialization of the generic OpenStack one. type Driver struct { *openstack.Driver @@ -108,10 +104,6 @@ func (d *Driver) DriverName() string { return "rackspace" } -func (d *Driver) GetDockerConfigDir() string { - return dockerConfigDir -} - func missingEnvOrOption(setting, envVar, opt string) error { return fmt.Errorf( "%s must be specified either using the environment variable %s or the CLI option %s", diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go index 5f5bc3ce65..d69c93c7d7 100644 --- a/drivers/softlayer/driver.go +++ b/drivers/softlayer/driver.go @@ -17,8 +17,7 @@ import ( ) const ( - dockerConfigDir = "/etc/docker" - ApiEndpoint = "https://api.softlayer.com/rest/v3" + ApiEndpoint = "https://api.softlayer.com/rest/v3" ) type Driver struct { diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go index 247a7b92b2..f3e6e60b2a 100644 --- a/drivers/virtualbox/virtualbox.go +++ b/drivers/virtualbox/virtualbox.go @@ -26,8 +26,7 @@ import ( ) const ( - dockerConfigDir = "/var/lib/boot2docker" - isoFilename = "boot2docker.iso" + isoFilename = "boot2docker.iso" ) type Driver struct { diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go index 64b2c15265..78ed38700c 100644 --- a/drivers/vmwarefusion/fusion_darwin.go +++ b/drivers/vmwarefusion/fusion_darwin.go @@ -29,10 +29,9 @@ import ( ) const ( - B2D_USER = "docker" - B2D_PASS = "tcuser" - dockerConfigDir = "/var/lib/boot2docker" - isoFilename = "boot2docker-1.5.0-GH747.iso" + B2D_USER = "docker" + B2D_PASS = "tcuser" + isoFilename = "boot2docker-1.5.0-GH747.iso" ) // Driver for VMware Fusion diff --git a/drivers/vmwarevcloudair/vcloudair.go b/drivers/vmwarevcloudair/vcloudair.go index 89ec387745..a115da8899 100644 --- a/drivers/vmwarevcloudair/vcloudair.go +++ b/drivers/vmwarevcloudair/vcloudair.go @@ -21,10 +21,6 @@ import ( "github.com/docker/machine/state" ) -const ( - dockerConfigDir = "/etc/docker" -) - type Driver struct { UserName string UserPassword string diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go index cbfc437f87..135b538a24 100644 --- a/drivers/vmwarevsphere/vsphere.go +++ b/drivers/vmwarevsphere/vsphere.go @@ -32,7 +32,6 @@ const ( isoFilename = "boot2docker-1.5.0-GH747.iso" B2D_ISO_NAME = isoFilename DEFAULT_CPU_NUMBER = 2 - dockerConfigDir = "/var/lib/boot2docker" B2D_USER = "docker" B2D_PASS = "tcuser" )