github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5291 from ktock/generic-diff

Browse Source 
images: use generic decompressor for calculating DiffID
This commit is contained in:
Maksym Pavlenko 2021-03-30 22:28:03 -07:00 committed by GitHub
commit 1c05317a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
images/diffid.go
View File

@ -17,10 +17,10 @@
package images package images
import ( import (
"compress/gzip"
"context" "context"
"io" "io"
"github.com/containerd/containerd/archive/compression"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/labels" "github.com/containerd/containerd/labels"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
@ -55,13 +55,14 @@ func GetDiffID(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (
} }
defer ra.Close() defer ra.Close()
r := content.NewReader(ra) r := content.NewReader(ra)
gzR, err := gzip.NewReader(r) uR, err := compression.DecompressStream(r)
if err != nil { if err != nil {
return "", err return "", err
} }
defer uR.Close()
digester := digest.Canonical.Digester() digester := digest.Canonical.Digester()
hashW := digester.Hash() hashW := digester.Hash()
if _, err := io.Copy(hashW, gzR); err != nil { if _, err := io.Copy(hashW, uR); err != nil {
return "", err return "", err
} }
if err := ra.Close(); err != nil { if err := ra.Close(); err != nil {