docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Restart() for some drivers 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-12-22 10:32:57 +01:00
parent c045ceec1e
commit 1c6ceed28e
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/google/google.go
View File

@ -342,6 +342,11 @@ func (d *Driver) Remove() error {
return c.deleteDisk()
}
// Restart restarts a machine which is known to be running.
func (d *Driver) Restart() error {
return nil
if err := d.Stop(); err != nil {
return err
}
return d.Start()
}

19
drivers/virtualbox/virtualbox.go
View File

@ -500,6 +500,10 @@ func (d *Driver) Start() error {
return ErrMustEnableVTX
}
return d.waitForIP()
}
func (d *Driver) waitForIP() error {
// Wait for SSH over NAT to be available before returning to user
if err := drivers.WaitForSSH(d); err != nil {
return err
@ -510,6 +514,7 @@ func (d *Driver) Start() error {
return err
}
var err error
d.IPAddress, err = d.GetIP()
return err
@ -572,18 +577,16 @@ func (d *Driver) Remove() error {
return d.vbm("unregistervm", "--delete", d.MachineName)
}
// Restart restarts a machine which is known to be running.
func (d *Driver) Restart() error {
s, err := d.GetState()
if err != nil {
log.Infof("Restarting VM...")
if err := d.vbm("controlvm", d.MachineName, "reset"); err != nil {
return err
}
if s == state.Running {
if err := d.Stop(); err != nil {
return err
}
}
return d.Start()
d.IPAddress = ""
return d.waitForIP()
}
func (d *Driver) Kill() error {