mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Use consistent ApplyLayer in overlayfs
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
parent
bfde3f2cd1
commit
f47d6b9b9d
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue