toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that the container dir is remove on restore

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a115ce797b80a14d268fcd96521cf05d1e1074c1
Component: engine
This commit is contained in:
Michael Crosby
2014-02-27 08:28:55 -08:00
parent 02cbc6e6b4
commit 9c9bdcb0ef
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/execdriver/native/driver.go
+4 -6
View File
@@ -108,20 +108,18 @@ func (d *driver) Kill(p *execdriver.Command, sig int) error {
}
func (d *driver) Restore(c *execdriver.Command) error {
var (
nspid int
path = filepath.Join(d.root, c.ID, "pid")
)
f, err := os.Open(path)
var nspid int
f, err := os.Open(filepath.Join(d.root, c.ID, "pid"))
if err != nil {
return err
}
defer d.removeContainerRoot(c.ID)
if _, err := fmt.Fscanf(f, "%d", &nspid); err != nil {
f.Close()
return err
}
f.Close()
defer os.Remove(path)
proc, err := os.FindProcess(nspid)
if err != nil {