Skip to content

Commit 87b8e57

Browse files
authored
Merge pull request #3485 from thaJeztah/update_vendor
vendor: containerd v1.6.2, buildkit v0.10.0
2 parents 0e3c9b2 + 5f74020 commit 87b8e57

File tree

175 files changed

+9736
-3010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+9736
-3010
lines changed

vendor.mod

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ module github.com/docker/cli
77
go 1.16
88

99
require (
10-
github.com/Microsoft/go-winio v0.5.1 // indirect
11-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
12-
github.com/containerd/containerd v1.5.10
10+
github.com/containerd/containerd v1.6.2
1311
github.com/creack/pty v1.1.11
1412
github.com/docker/distribution v2.8.1+incompatible
1513
github.com/docker/docker v20.10.7+incompatible // see "replace" for the actual version
@@ -22,16 +20,13 @@ require (
2220
github.com/google/go-cmp v0.5.7
2321
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2422
github.com/imdario/mergo v0.3.12
25-
github.com/klauspost/compress v1.15.0 // indirect
2623
github.com/mitchellh/mapstructure v1.3.2
27-
github.com/moby/buildkit v0.8.2-0.20210615162540-9f254e18360a // master (v0.9.0-dev)
24+
github.com/moby/buildkit v0.10.0
2825
github.com/moby/sys/signal v0.7.0
29-
github.com/moby/sys/symlink v0.2.0 // indirect
3026
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
3127
github.com/morikuni/aec v1.0.0
3228
github.com/opencontainers/go-digest v1.0.0
3329
github.com/opencontainers/image-spec v1.0.2
34-
github.com/opencontainers/runc v1.1.0 // indirect
3530
github.com/pkg/errors v0.9.1
3631
github.com/sirupsen/logrus v1.8.1
3732
github.com/spf13/cobra v1.1.3
@@ -42,19 +37,14 @@ require (
4237
github.com/xeipuuv/gojsonschema v1.2.0
4338
go.etcd.io/etcd/raft/v3 v3.5.2 // indirect
4439
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
45-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
4640
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
4741
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
4842
golang.org/x/text v0.3.7
49-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
50-
google.golang.org/grpc v1.38.0 // indirect
5143
gopkg.in/yaml.v2 v2.4.0
5244
gotest.tools/v3 v3.1.0
5345
)
5446

5547
replace (
5648
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220309172631-83b51522df43+incompatible // master (v21.xx-dev)
5749
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
58-
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.6.0
59-
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.11
6050
)

vendor.sum

Lines changed: 953 additions & 34 deletions
Large diffs are not rendered by default.

vendor/github.com/containerd/containerd/errdefs/errors.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/errdefs/grpc.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/log/context.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/pkg/userns/userns_unsupported.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/platforms/compare.go

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/platforms/cpuinfo.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/platforms/database.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/platforms/defaults.go

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)