Skip to content

Commit cfe96a9

Browse files
authored
Merge pull request #1846 from AkihiroSuda/bump-moby
go.mod: github.com/docker/docker v23.0.0-rc.2+incompatible
2 parents 50c4380 + cd5892f commit cfe96a9

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

go.mod

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ require (
2222
github.com/containernetworking/plugins v1.1.1
2323
github.com/coreos/go-systemd/v22 v22.5.0
2424
github.com/cyphar/filepath-securejoin v0.2.3
25-
github.com/docker/cli v20.10.22+incompatible
26-
github.com/docker/docker v20.10.21+incompatible
25+
github.com/docker/cli v23.0.0-rc.2+incompatible
26+
github.com/docker/docker v23.0.0-rc.2+incompatible
2727
github.com/docker/go-connections v0.4.0
2828
github.com/docker/go-units v0.5.0
2929
github.com/fahedouch/go-logrotate v0.1.3
@@ -58,16 +58,12 @@ require (
5858
gotest.tools/v3 v3.4.0
5959
)
6060

61-
require (
62-
github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 // indirect
63-
google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 // indirect
64-
)
65-
6661
require (
6762
github.com/AdaLogics/go-fuzz-headers v0.0.0-20221206110420-d395f97c4830 // indirect
6863
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 // indirect
6964
github.com/Microsoft/hcsshim v0.10.0-rc.1 // indirect
7065
github.com/cilium/ebpf v0.9.1 // indirect
66+
github.com/containerd/cgroups/v3 v3.0.0-20221112182753-e8802a182774 // indirect
7167
github.com/containerd/fifo v1.0.0 // indirect
7268
github.com/containerd/ttrpc v1.1.1-0.20220420014843-944ef4a40df3 // indirect
7369
github.com/containers/ocicrypt v1.1.6 // indirect
@@ -125,12 +121,10 @@ require (
125121
go.opentelemetry.io/otel/trace v1.11.1 // indirect
126122
golang.org/x/mod v0.6.0 // indirect
127123
golang.org/x/tools v0.2.0 // indirect
124+
google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 // indirect
128125
google.golang.org/grpc v1.51.0 // indirect
129126
google.golang.org/protobuf v1.28.1 // indirect
130127
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
131128
gopkg.in/yaml.v2 v2.4.0 // indirect
132129
lukechampine.com/blake3 v1.1.7 // indirect
133130
)
134-
135-
// we use this specific version of docker because of the buildkit depends on it: https://github.com/moby/buildkit/blob/c9a0f4d2de095591e742d7f411d9ed36a03a1c4e/go.mod#L153
136-
replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220831131523-b5a0d7a188ac+incompatible

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,15 @@ github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3
369369
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
370370
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
371371
github.com/docker/cli v20.10.21+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
372-
github.com/docker/cli v20.10.22+incompatible h1:0E7UqWPcn4SlvLImMHyh6xwyNRUGdPxhstpHeh0bFL0=
373-
github.com/docker/cli v20.10.22+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
372+
github.com/docker/cli v23.0.0-rc.2+incompatible h1:CEOrg0g6CrXKtg40kTleFJPLKXLMLevEesg/hO4ehM4=
373+
github.com/docker/cli v23.0.0-rc.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
374374
github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
375375
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
376376
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
377-
github.com/docker/docker v20.10.3-0.20220831131523-b5a0d7a188ac+incompatible h1:I60srfFFAC30qMnTaLaKA8SV74XYXPt9w8LdDc8BB0g=
378-
github.com/docker/docker v20.10.3-0.20220831131523-b5a0d7a188ac+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
377+
github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
378+
github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
379+
github.com/docker/docker v23.0.0-rc.2+incompatible h1:ykf9hN84Qce1oA8WcE1nsQaMtzwZ3p4trDbKBQDhXhI=
380+
github.com/docker/docker v23.0.0-rc.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
379381
github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
380382
github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o=
381383
github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=

0 commit comments

Comments
 (0)