Browse code

Use chrootarchive for plugin rootfs

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2017/05/19 06:53:46
Showing 1 changed files
... ...
@@ -12,6 +12,7 @@ import (
12 12
 	"github.com/docker/docker/image"
13 13
 	"github.com/docker/docker/layer"
14 14
 	"github.com/docker/docker/pkg/archive"
15
+	"github.com/docker/docker/pkg/chrootarchive"
15 16
 	"github.com/docker/docker/pkg/progress"
16 17
 	"github.com/opencontainers/go-digest"
17 18
 	"github.com/pkg/errors"
... ...
@@ -143,7 +144,7 @@ func (dm *downloadManager) Download(ctx context.Context, initialRootFS image.Roo
143 143
 			return initialRootFS, nil, err
144 144
 		}
145 145
 		digester := digest.Canonical.Digester()
146
-		if _, err := archive.ApplyLayer(dm.tmpDir, io.TeeReader(inflatedLayerData, digester.Hash())); err != nil {
146
+		if _, err := chrootarchive.ApplyLayer(dm.tmpDir, io.TeeReader(inflatedLayerData, digester.Hash())); err != nil {
147 147
 			return initialRootFS, nil, err
148 148
 		}
149 149
 		initialRootFS.Append(layer.DiffID(digester.Digest()))