vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #632 from dmcgowan/rootfs-fixes

Browse source 
Fix rootfs digest computation
This commit is contained in:
Stephen Day 2017-03-16 12:04:49 -07:00 • committed by GitHub
commit bb3fbded9c
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rootfs/apply.go
View file

@ -32,8 +32,6 @@ type Mounter interface {
//
// The returned digest is the diffID for the applied layer.
func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, parent digest.Digest) (digest.Digest, error) {
digester := digest.Canonical.Digester() // used to calculate diffID.
rd = io.TeeReader(rd, digester.Hash())
ctx := context.TODO()
// create a temporary directory to work from, needs to be on same
@ -68,6 +66,9 @@ func ApplyLayer(snapshots snapshot.Snapshotter, mounter Mounter, rd io.Reader, p
return "", err
}
digester := digest.Canonical.Digester() // used to calculate diffID.
rd = io.TeeReader(rd, digester.Hash())
if _, err := archive.Apply(context.Background(), key, rd); err != nil {
return "", err
}