Update estargz, drop multierror

google · Dec 17, 2020 · ed4e70f · ed4e70f
1 parent 3983a88
commit ed4e70f
Show file tree

Hide file tree

Showing 26 changed files with 129 additions and 1,508 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/v1/internal/estargz/estargz.go b/pkg/v1/internal/estargz/estargz.go
@@ -40,10 +40,11 @@ func ReadCloser(r io.ReadCloser, opts ...estargz.Option) (io.ReadCloser, v1.Hash
 	}
 	br := bytes.NewReader(bs)
 
-	rc, d, err := estargz.Build(io.NewSectionReader(br, 0, int64(len(bs))), nil, opts...)
+	rc, err := estargz.Build(io.NewSectionReader(br, 0, int64(len(bs))), opts...)
 	if err != nil {
 		return nil, v1.Hash{}, err
 	}
-	h, err := v1.NewHash(d.String())
+
+	h, err := v1.NewHash(rc.TOCDigest().String())
 	return rc, h, err
 }
diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/build.go
diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/errorutil/errors.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/errorutil/errors.go
diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go
diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/go.mod b/vendor/github.com/containerd/stargz-snapshotter/estargz/go.mod
diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/go.sum b/vendor/github.com/containerd/stargz-snapshotter/estargz/go.sum