diff --git a/drivers/google/compute_util.go b/drivers/google/compute_util.go index 0cdcdb6f32..c2646af2e9 100644 --- a/drivers/google/compute_util.go +++ b/drivers/google/compute_util.go @@ -9,7 +9,6 @@ import ( "time" log "github.com/Sirupsen/logrus" - "github.com/docker/machine/drivers" "github.com/docker/machine/ssh" raw "google.golang.org/api/compute/v1" ) @@ -254,9 +253,6 @@ func (c *ComputeUtil) updateDocker(d *Driver) error { if err := c.executeCommands(commands, ip, d.sshKeyPath); err != nil { return err } - if err := drivers.AddPublicKeyToAuthorizedHosts(d, "/.docker/authorized-keys.d"); err != nil { - return err - } return c.executeCommands([]string{dockerStartCommand}, ip, d.sshKeyPath) } diff --git a/drivers/vmwarefusion/fusion.go b/drivers/vmwarefusion/fusion.go index 4a85cc3bc9..775e0515e4 100644 --- a/drivers/vmwarefusion/fusion.go +++ b/drivers/vmwarefusion/fusion.go @@ -36,6 +36,7 @@ const ( // Driver for VMware Fusion type Driver struct { MachineName string + IPAddress string Memory int DiskSize int ISO string @@ -233,6 +234,8 @@ func (d *Driver) Create() error { return fmt.Errorf("Machine didn't return an IP after 120 seconds, aborting") } + d.IPAddress = ip + key, err := ioutil.ReadFile(d.publicSSHKeyPath()) if err != nil { return err