Skip to content

Commit 71fce0a

Browse files
authored
Merge pull request moby#3435 from thaJeztah/bump_engine
vendor: docker and docker/cli v23.0.0-rc.1
2 parents fff089f + 2b5ff24 commit 71fce0a

File tree

6 files changed

+15
-22
lines changed

6 files changed

+15
-22
lines changed

go.mod

Lines changed: 3 additions & 3 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.13
18+
github.com/containerd/containerd v1.6.14
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
@@ -25,9 +25,9 @@ require (
2525
github.com/containerd/stargz-snapshotter/estargz v0.13.0
2626
github.com/containerd/typeurl v1.0.2
2727
github.com/coreos/go-systemd/v22 v22.4.0
28-
github.com/docker/cli v23.0.0-beta.1+incompatible
28+
github.com/docker/cli v23.0.0-rc.1+incompatible
2929
github.com/docker/distribution v2.8.1+incompatible
30-
github.com/docker/docker v23.0.0-beta.1+incompatible
30+
github.com/docker/docker v23.0.0-rc.1+incompatible
3131
github.com/docker/go-connections v0.4.0
3232
github.com/docker/go-units v0.5.0
3333
github.com/gofrs/flock v0.8.1

go.sum

Lines changed: 6 additions & 6 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.13 h1:7llWEzjLH/fao0f2lppn1L6NhjsvxqMdUQa2mgVCs+U=
374-
github.com/containerd/containerd v1.6.13/go.mod h1:vDm+BbU+dD9uvuUlHr+KmcY0HKX8WDyI6dzJjNi4ee8=
373+
github.com/containerd/containerd v1.6.14 h1:W+d0AJKVG3ioTZZyQwcw1Y3vvo6ZDYzAcjDcY4tkgGI=
374+
github.com/containerd/containerd v1.6.14/go.mod h1:U2NnBPIhzJDm59xF7xB2MMHnKtggpZ+phKg8o2TKj2c=
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=
@@ -507,8 +507,8 @@ github.com/docker/cli v0.0.0-20190925022749-754388324470/go.mod h1:JLrzqnKDaYBop
507507
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
508508
github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
509509
github.com/docker/cli v20.10.21+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
510-
github.com/docker/cli v23.0.0-beta.1+incompatible h1:K9CMaN5nHB1eu2f02PURnJhlPhWuFl0s9mL3kildAtE=
511-
github.com/docker/cli v23.0.0-beta.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
510+
github.com/docker/cli v23.0.0-rc.1+incompatible h1:Vl3pcUK4/LFAD56Ys3BrqgAtuwpWd/IO3amuSL0ZbP0=
511+
github.com/docker/cli v23.0.0-rc.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
512512
github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
513513
github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
514514
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -522,8 +522,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r
522522
github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
523523
github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
524524
github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
525-
github.com/docker/docker v23.0.0-beta.1+incompatible h1:0Xv+AFPWxTbmohdLK57pYRPmefCKthtfRF/qQwXHolg=
526-
github.com/docker/docker v23.0.0-beta.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
525+
github.com/docker/docker v23.0.0-rc.1+incompatible h1:Dmn88McWuHc7BSNN1s6RtfhMmt6ZPQAYUEf7FhqpiQI=
526+
github.com/docker/docker v23.0.0-rc.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
527527
github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
528528
github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
529529
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=

vendor/github.com/containerd/containerd/version/version.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/docker/cli/cli/connhelper/commandconn/commandconn.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/docker/docker/errdefs/http_helpers.go

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

vendor/modules.txt

Lines changed: 3 additions & 3 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.13
218+
# github.com/containerd/containerd v1.6.14
219219
## explicit; go 1.17
220220
github.com/containerd/containerd
221221
github.com/containerd/containerd/api/services/containers/v1
@@ -372,7 +372,7 @@ github.com/davecgh/go-spew/spew
372372
# github.com/dimchansky/utfbom v1.1.1
373373
## explicit
374374
github.com/dimchansky/utfbom
375-
# github.com/docker/cli v23.0.0-beta.1+incompatible
375+
# github.com/docker/cli v23.0.0-rc.1+incompatible
376376
## explicit
377377
github.com/docker/cli/cli/config
378378
github.com/docker/cli/cli/config/configfile
@@ -383,7 +383,7 @@ github.com/docker/cli/cli/connhelper/commandconn
383383
## explicit
384384
github.com/docker/distribution/digestset
385385
github.com/docker/distribution/reference
386-
# github.com/docker/docker v23.0.0-beta.1+incompatible
386+
# github.com/docker/docker v23.0.0-rc.1+incompatible
387387
## explicit
388388
github.com/docker/docker/api
389389
github.com/docker/docker/api/types

0 commit comments

Comments
 (0)