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

Image: unmount device before removing it on failures

Browse Source 
If we don't do this the remove will fail due to EBUSY
Upstream-commit: ecdbdfdaea5497c34a0299e7efd97b8a44bd7314
Component: engine
This commit is contained in:
Alexander Larsson
2013-09-19 14:59:27 +02:00
committed by Tianon Gravi
parent 6101a0a475
commit 17aec56f2a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/image.go
View File

@ -414,6 +414,7 @@ func (image *Image) ensureImageDevice(devices DeviceSet) error {
err = ioutil.WriteFile(path.Join(mountDir, ".docker-id"), []byte(image.ID), 0600)
if err != nil {
_ = devices.UnmountDevice(image.ID, mountDir)
_ = devices.RemoveDevice(image.ID)
return err
}
@ -432,11 +433,13 @@ func (image *Image) ensureImageDevice(devices DeviceSet) error {
// part of the container changes
dockerinitLayer, err := image.getDockerInitLayer()
if err != nil {
_ = devices.UnmountDevice(image.ID, mountDir)
_ = devices.RemoveDevice(image.ID)
return err
}
err = image.applyLayer(dockerinitLayer, mountDir)
if err != nil {
_ = devices.UnmountDevice(image.ID, mountDir)
_ = devices.RemoveDevice(image.ID)
return err
}