drivers: remove unneeded GetDockerConfigDir() and dockerConfigDir const
This method is not part of the driver interface anymore. Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
This commit is contained in:
@@ -22,10 +22,6 @@ import (
|
||||
"github.com/docker/machine/state"
|
||||
)
|
||||
|
||||
const (
|
||||
dockerConfigDir = "/etc/docker"
|
||||
)
|
||||
|
||||
type Driver struct {
|
||||
MachineName string
|
||||
SubscriptionID string
|
||||
|
||||
@@ -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},
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -18,10 +18,6 @@ import (
|
||||
"github.com/docker/machine/utils"
|
||||
)
|
||||
|
||||
const (
|
||||
dockerConfigDir = "/var/lib/boot2docker"
|
||||
)
|
||||
|
||||
type Driver struct {
|
||||
SSHUser string
|
||||
SSHPort int
|
||||
|
||||
@@ -16,10 +16,6 @@ import (
|
||||
"github.com/docker/machine/state"
|
||||
)
|
||||
|
||||
const (
|
||||
dockerConfigDir = "/etc/docker"
|
||||
)
|
||||
|
||||
type Driver struct {
|
||||
AuthUrl string
|
||||
Insecure bool
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -26,8 +26,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
dockerConfigDir = "/var/lib/boot2docker"
|
||||
isoFilename = "boot2docker.iso"
|
||||
isoFilename = "boot2docker.iso"
|
||||
)
|
||||
|
||||
type Driver struct {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -21,10 +21,6 @@ import (
|
||||
"github.com/docker/machine/state"
|
||||
)
|
||||
|
||||
const (
|
||||
dockerConfigDir = "/etc/docker"
|
||||
)
|
||||
|
||||
type Driver struct {
|
||||
UserName string
|
||||
UserPassword string
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user