diff --git a/go.mod b/go.mod index 77d03375431..517792589c5 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/containers/image/v5 v5.10.6 github.com/containers/libpod/v2 v2.0.6 github.com/containers/ocicrypt v1.0.3 - github.com/containers/storage v1.24.9-0.20210726165804-a308a1189f51 + github.com/containers/storage v1.24.9-0.20210812201127-9206c19a100d github.com/coreos/go-systemd/v22 v22.1.0 github.com/cpuguy83/go-md2man v1.0.10 github.com/creack/pty v1.1.11 diff --git a/go.sum b/go.sum index 1c0dcab4a98..2d27783cf4d 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,8 @@ github.com/containers/storage v1.23.5/go.mod h1:ha26Q6ngehFNhf3AWoXldvAvwI4jFe3E github.com/containers/storage v1.23.6/go.mod h1:haFs0HRowKwyzvWEx9EgI3WsL8XCSnBDb5f8P5CAxJY= github.com/containers/storage v1.23.7/go.mod h1:cUT2zHjtx+WlVri30obWmM2gpqpi8jfPsmIzP1TVpEI= github.com/containers/storage v1.24.8/go.mod h1:YC+2pY8SkfEAcZkwycxYbpK8EiRbx5soPPwz9dxe4IQ= -github.com/containers/storage v1.24.9-0.20210726165804-a308a1189f51 h1:35wYPmmZAdx5fDfbIBtPsD8/jc10bgM9QueXBgSac/0= -github.com/containers/storage v1.24.9-0.20210726165804-a308a1189f51/go.mod h1:5Gjxx8EqRRuTC6J2dbQ/5SMs43SHhe3Ky+BzyeNVPZM= +github.com/containers/storage v1.24.9-0.20210812201127-9206c19a100d h1:M0+dczsY1TtV8JKiIK822DhHyxpyPTBA5MDStyb4v+g= +github.com/containers/storage v1.24.9-0.20210812201127-9206c19a100d/go.mod h1:5Gjxx8EqRRuTC6J2dbQ/5SMs43SHhe3Ky+BzyeNVPZM= github.com/coredns/corefile-migration v1.0.10/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/github.com/containers/storage/layers.go index 680b23dd790..904cc94b0e9 100644 --- a/vendor/github.com/containers/storage/layers.go +++ b/vendor/github.com/containers/storage/layers.go @@ -28,6 +28,7 @@ import ( digest "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "github.com/vbatts/tar-split/archive/tar" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" @@ -1326,6 +1327,9 @@ func (r *layerStore) ApplyDiff(to string, diff io.Reader) (size int64, err error if err != nil { compressor = pgzip.NewWriter(&tsdata) } + if err := compressor.SetConcurrency(1024*1024, 1); err != nil { // 1024*1024 is the hard-coded default; we're not changing that + logrus.Infof("error setting compression concurrency threads to 1: %v; ignoring", err) + } metadata := storage.NewJSONPacker(compressor) uncompressed, err := archive.DecompressStream(defragmented) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 3163335273e..65202d8429b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -245,7 +245,7 @@ github.com/containers/psgo/internal/dev github.com/containers/psgo/internal/host github.com/containers/psgo/internal/proc github.com/containers/psgo/internal/process -# github.com/containers/storage v1.24.9-0.20210726165804-a308a1189f51 +# github.com/containers/storage v1.24.9-0.20210812201127-9206c19a100d ## explicit github.com/containers/storage github.com/containers/storage/drivers