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

Merge pull request #17497 from LK4D4/put_err

Browse Source 
Do not ignore errors from graphdriver.Put
Upstream-commit: 82203d06ebbd7e205cf620c2e8555914f3c86d8f
Component: engine
This commit is contained in:
Brian Goff
2015-10-29 19:37:10 -04:00
parent db9e9ee3c5 b276a5731c
commit 631571fcc6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/daemon.go
+6 -2
View File
@@ -992,13 +992,17 @@ func (daemon *Daemon) createRootfs(container *Container) error {
}
if err := setupInitLayer(initPath, rootUID, rootGID); err != nil {
daemon.driver.Put(initID)
if err := daemon.driver.Put(initID); err != nil {
logrus.Errorf("Failed to Put init layer: %v", err)
}
return err
}
// We want to unmount init layer before we take snapshot of it
// for the actual container.
daemon.driver.Put(initID)
if err := daemon.driver.Put(initID); err != nil {
return err
}
if err := daemon.driver.Create(container.ID, initID); err != nil {
return err