containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

layers: use the package name pgzip instead of gzip 

based on some comments got on the related PR for containers/image.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-12-17 12:29:08 +01:00
parent 189c6f5bb9
commit 6ef3b9dafa
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layers.go
View File

@ -19,7 +19,7 @@ import (
"github.com/containers/storage/pkg/stringid" "github.com/containers/storage/pkg/stringid"
"github.com/containers/storage/pkg/system" "github.com/containers/storage/pkg/system"
"github.com/containers/storage/pkg/truncindex" "github.com/containers/storage/pkg/truncindex"
gzip "github.com/klauspost/pgzip" "github.com/klauspost/pgzip"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -1055,7 +1055,7 @@ func (r *layerStore) Diff(from, to string, options *DiffOptions) (io.ReadCloser,
} }
defer tsfile.Close() defer tsfile.Close()
decompressor, err := gzip.NewReader(tsfile) decompressor, err := pgzip.NewReader(tsfile)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1116,9 +1116,9 @@ func (r *layerStore) ApplyDiff(to string, diff io.Reader) (size int64, err error
defragmented := io.TeeReader(io.MultiReader(bytes.NewBuffer(header[:n]), diff), compressedCounter) defragmented := io.TeeReader(io.MultiReader(bytes.NewBuffer(header[:n]), diff), compressedCounter)
tsdata := bytes.Buffer{} tsdata := bytes.Buffer{}
compressor, err := gzip.NewWriterLevel(&tsdata, gzip.BestSpeed) compressor, err := pgzip.NewWriterLevel(&tsdata, pgzip.BestSpeed)
if err != nil { if err != nil {
compressor = gzip.NewWriter(&tsdata) compressor = pgzip.NewWriter(&tsdata)
} }
metadata := storage.NewJSONPacker(compressor) metadata := storage.NewJSONPacker(compressor)
uncompressed, err := archive.DecompressStream(defragmented) uncompressed, err := archive.DecompressStream(defragmented)