From f47d6b9b9de8c567e9e42e12243cbcce99a7bfc7 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 4 Dec 2014 12:03:44 -0800 Subject: [PATCH] Use consistent ApplyLayer in overlayfs Signed-off-by: Michael Crosby --- daemon/graphdriver/overlay/overlay.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go index c45c3ea7ad..2569ccb6d1 100644 --- a/daemon/graphdriver/overlay/overlay.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -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 }