kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Use consistent ApplyLayer in overlayfs

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2014-12-04 12:03:44 -08:00
parent bfde3f2cd1
commit f47d6b9b9d
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
} }