Skip to content

Commit

Permalink
Merge pull request #3280 from ktock/stargz-snapshotter-v0.13.0
Browse files Browse the repository at this point in the history
Bump up containerd (v1.6.10), stargz-snapshotter(v0.13.0)
  • Loading branch information
tonistiigi committed Nov 16, 2022
2 parents 1094612 + 9b715b7 commit 0c20ec3
Show file tree
Hide file tree
Showing 304 changed files with 10,914 additions and 12,618 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
@@ -1,14 +1,14 @@
# syntax=docker/dockerfile-upstream:1.4

ARG RUNC_VERSION=v1.1.3
ARG CONTAINERD_VERSION=v1.6.6
ARG RUNC_VERSION=v1.1.4
ARG CONTAINERD_VERSION=v1.6.10
# containerd v1.5 for integration tests
ARG CONTAINERD_ALT_VERSION_15=v1.5.11
ARG CONTAINERD_ALT_VERSION_15=v1.5.14
ARG REGISTRY_VERSION=2.8.0
ARG ROOTLESSKIT_VERSION=v0.14.6
ARG CNI_VERSION=v1.1.0
ARG STARGZ_SNAPSHOTTER_VERSION=v0.12.0
ARG NERDCTL_VERSION=v0.17.1
ARG ROOTLESSKIT_VERSION=v1.0.1
ARG CNI_VERSION=v1.1.1
ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0
ARG NERDCTL_VERSION=v1.0.0
ARG DNSNAME_VERSION=v1.3.1
ARG NYDUS_VERSION=v2.1.0

Expand Down
36 changes: 18 additions & 18 deletions go.mod
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
github.com/Microsoft/go-winio v0.5.2
github.com/Microsoft/hcsshim v0.9.4
github.com/Microsoft/hcsshim v0.9.5
github.com/agext/levenshtein v1.2.3
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
github.com/aws/aws-sdk-go-v2/config v1.15.5
Expand All @@ -15,17 +15,17 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.9
github.com/aws/smithy-go v1.11.2
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.6.8
github.com/containerd/containerd v1.6.10
github.com/containerd/continuity v0.3.0
github.com/containerd/fuse-overlayfs-snapshotter v1.0.2
github.com/containerd/go-cni v1.1.6
github.com/containerd/go-runc v1.0.0
github.com/containerd/nydus-snapshotter v0.3.1
github.com/containerd/stargz-snapshotter v0.12.0
github.com/containerd/stargz-snapshotter/estargz v0.12.0
github.com/containerd/stargz-snapshotter v0.13.0
github.com/containerd/stargz-snapshotter/estargz v0.13.0
github.com/containerd/typeurl v1.0.2
github.com/coreos/go-systemd/v22 v22.4.0
github.com/docker/cli v20.10.17+incompatible
github.com/docker/cli v20.10.21+incompatible
github.com/docker/distribution v2.8.1+incompatible
github.com/docker/docker v20.10.18+incompatible // v22.06.x - see "replace" for the actual version
github.com/docker/go-connections v0.4.0
Expand All @@ -34,14 +34,14 @@ require (
github.com/gogo/googleapis v1.4.1
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.7
github.com/google/go-cmp v0.5.9
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hashicorp/go-immutable-radix v1.3.1
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/golang-lru v0.5.4
github.com/in-toto/in-toto-golang v0.3.3
github.com/klauspost/compress v1.15.9
github.com/klauspost/compress v1.15.12
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/moby/locker v1.0.1
github.com/moby/patternmatcher v0.5.0
Expand All @@ -58,8 +58,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/pkg/profile v1.5.0
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.1
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.0
github.com/tonistiigi/fsutil v0.0.0-20220930225714-4638ad635be5
github.com/tonistiigi/go-actions-cache v0.0.0-20220404170428-0bdeb6e1eac7
github.com/tonistiigi/go-archvariant v1.0.0
Expand All @@ -80,11 +80,11 @@ require (
go.opentelemetry.io/proto/otlp v0.12.0
golang.org/x/crypto v0.2.0
golang.org/x/net v0.2.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sync v0.1.0
golang.org/x/sys v0.2.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6
google.golang.org/grpc v1.47.0
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21
google.golang.org/grpc v1.50.1
)

require (
Expand Down Expand Up @@ -118,7 +118,7 @@ require (
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -136,10 +136,10 @@ require (
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shibumi/go-pathspec v1.2.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
Expand All @@ -149,7 +149,7 @@ require (
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
go.opentelemetry.io/otel/metric v0.27.0 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down

0 comments on commit 0c20ec3

Please sign in to comment.