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

Merge pull request #2770 from daehyeok/google_rm 

GCE delete instance during rm
This commit is contained in:
Jean-Laurent de Morlhon 2016-01-07 10:54:27 +01:00
parent 276e7e48b6 c33fd0d548
commit 7a893e1491
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/google/google.go
View File

@ -360,14 +360,9 @@ func (d *Driver) Remove() error {
return err
}
s, err := d.GetState()
if err != nil {
if err := c.deleteInstance(); err != nil {
return err
}
if s == state.Running {
if err := c.deleteInstance(); err != nil {
return err
}
}
return c.deleteDisk()
}