Merge pull request #500 from AkihiroSuda/update-20211108

update RootlessKit (v0.14.6), stargz-snapshotter (v0.10.0)

Author: AkihiroSuda

Dockerfile

@@ -25,11 +25,11 @@ ARG CNI_ISOLATION_VERSION=0.0.4
 # Extra deps: Build
 ARG BUILDKIT_VERSION=0.9.2
 # Extra deps: Lazy-pulling
-ARG STARGZ_SNAPSHOTTER_VERSION=0.9.0
+ARG STARGZ_SNAPSHOTTER_VERSION=0.10.0
 # Extra deps: Encryption
 ARG IMGCRYPT_VERSION=1.1.2
 # Extra deps: Rootless
-ARG ROOTLESSKIT_VERSION=0.14.5
+ARG ROOTLESSKIT_VERSION=0.14.6
 ARG SLIRP4NETNS_VERSION=1.1.12
 # Extra deps: FUSE-OverlayFS
 ARG FUSE_OVERLAYFS_VERSION=1.7.1

Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.5

@@ -0,0 +1,5 @@
+e89892a012788376be63dcf2ee3ba9b70051704e6e50d3b079812094f51b0151  rootlesskit-aarch64.tar.gz
+5a4a453e1076ce6da4ec95509b5f1b3c69a316753c81eb51c0352c0adaff54b1  rootlesskit-armv7l.tar.gz
+a0e5d2aa0ed5b9de7c57f558e002c0f910efff1506093a149320e2fa148b2aa5  rootlesskit-ppc64le.tar.gz
+e4f9b3f8866bd170697f8e4f8607085c2d7f949be498f38205e08f3771b41f3b  rootlesskit-s390x.tar.gz
+cb44480e8e669f2ae5c2a27495b6cbf195fd1e3debde9c783e727c565fc40abc  rootlesskit-x86_64.tar.gz

Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.6

@@ -0,0 +1,3 @@
+e5bcfec5ab68f819ca679a17a40ed6cde2807d316368ef17a916a7f52fd02646  stargz-snapshotter-v0.10.0-linux-amd64.tar.gz
+107ebaa0fa1b8081ffb7a47f8912a3a5d44aadd79852b28caf7826b1cb8a2350  stargz-snapshotter-v0.10.0-linux-arm64.tar.gz
+f1cf855870af16a653d8acb9daa3edf84687c2c05323cb958f078fb148af3eec  stargz-snapshotter.service

Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-0.10.0

@@ -7,45 +7,41 @@ require (
 	github.com/compose-spec/compose-go v1.0.4
 	github.com/containerd/cgroups v1.0.2
 	github.com/containerd/console v1.0.3
-	github.com/containerd/containerd v1.5.7 // replaced, see the bottom of this file
-	github.com/containerd/containerd/api v0.0.0 // replaced, see the bottom of this file
+	github.com/containerd/containerd v1.6.0-beta.1.0.20211101005050-f0d3ea96cf8c
+	github.com/containerd/containerd/api v1.6.0-beta.1.0.20211101005050-f0d3ea96cf8c
 	github.com/containerd/continuity v0.2.1
 	github.com/containerd/go-cni v1.1.0
 	github.com/containerd/imgcrypt v1.1.2
-	github.com/containerd/stargz-snapshotter v0.9.0
-	github.com/containerd/stargz-snapshotter/estargz v0.9.0
+	github.com/containerd/stargz-snapshotter v0.10.0
+	github.com/containerd/stargz-snapshotter/estargz v0.10.0
 	github.com/containerd/typeurl v1.0.2
 	github.com/containernetworking/cni v1.0.1
 	github.com/containernetworking/plugins v1.0.1
 	github.com/cyphar/filepath-securejoin v0.2.3
 	github.com/docker/cli v20.10.10+incompatible
-	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v20.10.10+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.4.0
 	github.com/fatih/color v1.13.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/mattn/go-isatty v0.0.14
 	github.com/moby/sys/mount v0.2.0
-	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283
-	github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea
-	github.com/rootless-containers/rootlesskit v0.14.5
+	github.com/opencontainers/image-spec v1.0.2-0.20211102003311-9a7a9876500e
+	github.com/opencontainers/runtime-spec v1.0.3-0.20211101234015-a3c33d663ebc
+	github.com/rootless-containers/rootlesskit v0.14.6
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.2.1 // replaced, see the bottom of this file
 	github.com/spf13/pflag v1.0.5 // replaced, see the bottom of this file
 	github.com/tidwall/gjson v1.11.0
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef
+	golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 	gotest.tools/v3 v3.0.3
 )
 
 replace (
-	github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20211004173205-d193dc2b8afb
-	github.com/containerd/containerd/api => github.com/containerd/containerd/api v0.0.0-20211004173205-d193dc2b8afb
 	github.com/spf13/cobra => github.com/robberphex/cobra v1.2.2-0.20211012081327-8e3ac9400ac4 // https://github.com/spf13/cobra/pull/1503
 	github.com/spf13/pflag => github.com/robberphex/pflag v1.0.6-0.20211014094653-9df3e45100fd // https://github.com/spf13/pflag/pull/333
 )