Bump estargz lib to reflect the tar-split-based implementation

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>

cache/estargz.go

@@ -28,11 +28,9 @@ func compressEStargz() (compressorFunc compressor, finalize func(context.Context
 				return nil, fmt.Errorf("unsupported media type for estargz compressor %q", requiredMediaType)
 			}
 			done := make(chan struct{})
-
 			pr, pw := io.Pipe()
 			go func() (retErr error) {
 				defer close(done)
-				defer pr.Close()
 				defer func() {
 					if retErr != nil {
 						mu.Lock()
@@ -64,14 +62,11 @@ func compressEStargz() (compressorFunc compressor, finalize func(context.Context
 					pr.CloseWithError(err)
 					return err
 				}
-				if err != nil {
-					pr.CloseWithError(err)
-					return err
-				}
 				bInfo := <-bInfoCh
 				mu.Lock()
 				cInfo = &compressionInfo{bInfo, tocDgst}
 				mu.Unlock()
+				pr.Close()
 				return nil
 			}()
 			return &writeCloser{pw, func() error {

go.mod

@@ -118,6 +118,8 @@ require (
 	gotest.tools/v3 v3.0.3 // indirect
 )
 
+require github.com/vbatts/tar-split v0.11.2 // indirect
+
 replace (
 	github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210721160646-ee27cde735e2
 	github.com/docker/docker => github.com/docker/docker v20.10.3-0.20210817025855-ba2adeebdb8d+incompatible
@@ -127,6 +129,6 @@ replace (
 )
 
 replace (
-	github.com/containerd/stargz-snapshotter => github.com/ktock/stargz-snapshotter v0.0.0-20210908165114-5afc87f4daed
-	github.com/containerd/stargz-snapshotter/estargz => github.com/ktock/stargz-snapshotter/estargz v0.0.0-20210908165114-5afc87f4daed
+	github.com/containerd/stargz-snapshotter => github.com/ktock/stargz-snapshotter v0.0.0-20210909014945-1d70ca1e95b8
+	github.com/containerd/stargz-snapshotter/estargz => github.com/ktock/stargz-snapshotter/estargz v0.0.0-20210909014945-1d70ca1e95b8
 )

go.sum

@@ -404,10 +404,10 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/ktock/stargz-snapshotter v0.0.0-20210908165114-5afc87f4daed h1:6Sy5pt6y/HyTmebL6fHis/HBTqA1rZ4Y2gax9dHVyvU=
-github.com/ktock/stargz-snapshotter v0.0.0-20210908165114-5afc87f4daed/go.mod h1:el+Sa0PJurvbKxUim9y/AaaeE+lDqSAB+CcKxHQOB70=
-github.com/ktock/stargz-snapshotter/estargz v0.0.0-20210908165114-5afc87f4daed h1:bCX7fzjjeAT/QlBlrTEk3pMLZONn0qvzdn/s4/eqgDU=
-github.com/ktock/stargz-snapshotter/estargz v0.0.0-20210908165114-5afc87f4daed/go.mod h1:mwIwuwb+D8FX2t45Trwi0hmWmZm5VW7zPP/rekwhWQU=
+github.com/ktock/stargz-snapshotter v0.0.0-20210909014945-1d70ca1e95b8 h1:m0yv4R2lC6CUdoumGAf+OSoQfVRo37c4x0lD63DLwsE=
+github.com/ktock/stargz-snapshotter v0.0.0-20210909014945-1d70ca1e95b8/go.mod h1:VWbnkZwoaOVh9W1n+dQ9xxXNgTA14SrDNVhq269Odp8=
+github.com/ktock/stargz-snapshotter/estargz v0.0.0-20210909014945-1d70ca1e95b8 h1:qZ1F8hLw/F0DP3bw3Qf+y1xePN4o08EW4J1eqrLpNZc=
+github.com/ktock/stargz-snapshotter/estargz v0.0.0-20210909014945-1d70ca1e95b8/go.mod h1:ndCBLrMyXFyfgBEPHgdR0Ywe8O/kuTShyUsKOzIVeyw=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -630,6 +630,8 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
+github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 h1:cPXZWzzG0NllBLdjWoD1nDfaqu98YMv+OneaKc8sPOA=
 github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=