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

Merge pull request #9510 from crosbymichael/chrootarchive

Browse Source 
Use consistent ApplyLayer in overlayfs
Upstream-commit: 6e7a210db69eb59b08a1b1deb76f89630d5bece4
Component: engine
This commit is contained in:
Michael Crosby
2014-12-04 14:21:26 -08:00
parent d749cd5cd2 ac96967ba9
commit 5190e1516a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/daemon/graphdriver/overlay/overlay.go
View File

@ -15,6 +15,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/chrootarchive"
"github.com/docker/libcontainer/label"
)
@ -346,7 +347,7 @@ func (d *Driver) ApplyDiff(id string, parent string, diff archive.ArchiveReader)
return 0, err
}
if err := archive.ApplyLayer(tmpRootDir, diff); err != nil {
if err := chrootarchive.ApplyLayer(tmpRootDir, diff); err != nil {
return 0, err
}