Skip to content

Commit 2ee0bce

Browse files
authored
Merge pull request moby#3531 from tonistiigi/vendor-containerd-1.6
vendor: update containerd to v1.6.16-0.1709cfe273d9
2 parents 66fedd0 + 93cdca5 commit 2ee0bce

File tree

9 files changed

+77
-54
lines changed

9 files changed

+77
-54
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.9
1616
github.com/aws/smithy-go v1.11.2
1717
github.com/containerd/console v1.0.3
18-
github.com/containerd/containerd v1.6.15
18+
github.com/containerd/containerd v1.6.16-0.20230124210447-1709cfe273d9
1919
github.com/containerd/continuity v0.3.0
2020
github.com/containerd/fuse-overlayfs-snapshotter v1.0.2
2121
github.com/containerd/go-cni v1.1.6
@@ -54,7 +54,7 @@ require (
5454
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
5555
github.com/opencontainers/selinux v1.10.2
5656
github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170
57-
github.com/pelletier/go-toml v1.9.4
57+
github.com/pelletier/go-toml v1.9.5
5858
github.com/pkg/errors v0.9.1
5959
github.com/pkg/profile v1.5.0
6060
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002

go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0
370370
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
371371
github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
372372
github.com/containerd/containerd v1.6.9/go.mod h1:XVicUvkxOrftE2Q1YWUXgZwkkAxwQYNOFzYWvfVfEfQ=
373-
github.com/containerd/containerd v1.6.15 h1:4wWexxzLNHNE46aIETc6ge4TofO550v+BlLoANrbses=
374-
github.com/containerd/containerd v1.6.15/go.mod h1:U2NnBPIhzJDm59xF7xB2MMHnKtggpZ+phKg8o2TKj2c=
373+
github.com/containerd/containerd v1.6.16-0.20230124210447-1709cfe273d9 h1:zdFesNKUzj0PDylWScwyU6zv3KAKwYeSE1ZLUmi01wk=
374+
github.com/containerd/containerd v1.6.16-0.20230124210447-1709cfe273d9/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
375375
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
376376
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
377377
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
@@ -1179,8 +1179,9 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
11791179
github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
11801180
github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
11811181
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
1182-
github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
11831182
github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
1183+
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
1184+
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
11841185
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
11851186
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw=
11861187
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=

vendor/github.com/containerd/containerd/remotes/docker/pusher.go

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

vendor/github.com/pelletier/go-toml/README.md

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/pelletier/go-toml/SECURITY.md

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

vendor/github.com/pelletier/go-toml/marshal.go

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

vendor/github.com/pelletier/go-toml/parser.go

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

vendor/github.com/pelletier/go-toml/toml.go

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

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ github.com/containerd/cgroups/stats/v1
215215
# github.com/containerd/console v1.0.3
216216
## explicit; go 1.13
217217
github.com/containerd/console
218-
# github.com/containerd/containerd v1.6.15
218+
# github.com/containerd/containerd v1.6.16-0.20230124210447-1709cfe273d9
219219
## explicit; go 1.17
220220
github.com/containerd/containerd
221221
github.com/containerd/containerd/api/services/containers/v1
@@ -617,7 +617,7 @@ github.com/opencontainers/selinux/pkg/pwalkdir
617617
# github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170
618618
## explicit; go 1.17
619619
github.com/package-url/packageurl-go
620-
# github.com/pelletier/go-toml v1.9.4
620+
# github.com/pelletier/go-toml v1.9.5
621621
## explicit; go 1.12
622622
github.com/pelletier/go-toml
623623
# github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4

0 commit comments

Comments
 (0)