From 14bb0faf0c0533fb11953c06fa66baf7685089d0 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 18 May 2017 14:53:46 -0700 Subject: [PATCH] Use chrootarchive for plugin rootfs Signed-off-by: Tonis Tiigi Upstream-commit: 6f3f907cdba0ba1aa4eb1320595d155bab3467af Component: engine --- components/engine/plugin/blobstore.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/plugin/blobstore.go b/components/engine/plugin/blobstore.go index b407884cc7..172f6b235e 100644 --- a/components/engine/plugin/blobstore.go +++ b/components/engine/plugin/blobstore.go @@ -12,6 +12,7 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/archive" + "github.com/docker/docker/pkg/chrootarchive" "github.com/docker/docker/pkg/progress" "github.com/opencontainers/go-digest" "github.com/pkg/errors" @@ -143,7 +144,7 @@ func (dm *downloadManager) Download(ctx context.Context, initialRootFS image.Roo return initialRootFS, nil, err } digester := digest.Canonical.Digester() - if _, err := archive.ApplyLayer(dm.tmpDir, io.TeeReader(inflatedLayerData, digester.Hash())); err != nil { + if _, err := chrootarchive.ApplyLayer(dm.tmpDir, io.TeeReader(inflatedLayerData, digester.Hash())); err != nil { return initialRootFS, nil, err } initialRootFS.Append(layer.DiffID(digester.Digest()))