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 chrootarchive for plugin rootfs

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2017-05-18 14:53:46 -07:00
parent 23e857cd3d
commit 6f3f907cdb
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/blobstore.go
View file

@ -12,6 +12,7 @@ import (
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/chrootarchive"
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -143,7 +144,7 @@ func (dm *downloadManager) Download(ctx context.Context, initialRootFS image.Roo
return initialRootFS, nil, err return initialRootFS, nil, err
} }
digester := digest.Canonical.Digester() 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 return initialRootFS, nil, err
} }
initialRootFS.Append(layer.DiffID(digester.Digest())) initialRootFS.Append(layer.DiffID(digester.Digest()))