mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #27963 from darrenstahlmsft/RenameDelete
Windows: Rename layers before deletion
This commit is contained in:
commit
cb352501af
1 changed files with 12 additions and 2 deletions
|
@ -243,8 +243,18 @@ func (d *Driver) Remove(id string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
os.RemoveAll(filepath.Join(d.info.HomeDir, "sysfile-backups", rID)) // ok to fail
|
|
||||||
return hcsshim.DestroyLayer(d.info, rID)
|
layerPath := filepath.Join(d.info.HomeDir, rID)
|
||||||
|
tmpID := fmt.Sprintf("%s-removing", rID)
|
||||||
|
tmpLayerPath := filepath.Join(d.info.HomeDir, tmpID)
|
||||||
|
if err := os.Rename(layerPath, tmpLayerPath); err != nil && !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := hcsshim.DestroyLayer(d.info, tmpID); err != nil {
|
||||||
|
logrus.Errorf("Failed to DestroyLayer %s: %s", id, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get returns the rootfs path for the id. This will mount the dir at its given path.
|
// Get returns the rootfs path for the id. This will mount the dir at its given path.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue