docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9510 from crosbymichael/chrootarchive 

Use consistent ApplyLayer in overlayfs
This commit is contained in:
Michael Crosby 2014-12-04 14:21:26 -08:00
parent bfde3f2cd1 f47d6b9b9d
commit 6e7a210db6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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