Skip to content

Commit 25dd1ec

Browse files
authored
Merge pull request #4266 from thaJeztah/start_25.0.0-dev
Update version to v25.0.0-dev, update to API v1.44
2 parents 03752a6 + 28bc90f commit 25dd1ec

6 files changed

Lines changed: 14 additions & 10 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.0.0-dev
1+
25.0.0-dev

vendor.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ module github.com/docker/cli
66

77
go 1.18
88

9+
// use a replace rule to prevent go mod downgrading (because master gets v24.0.0-rc.2.xxx pseudo-versions)
10+
replace github.com/docker/docker => github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible
11+
912
require (
1013
github.com/containerd/containerd v1.6.21
1114
github.com/creack/pty v1.1.18
1215
github.com/docker/distribution v2.8.1+incompatible
13-
github.com/docker/docker v24.0.0-rc.2+incompatible
16+
github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible // replaced; this is master / v25.0.0-dev; see replace rule above.
1417
github.com/docker/docker-credential-helpers v0.7.0
1518
github.com/docker/go-connections v0.4.0
1619
github.com/docker/go-units v0.5.0

vendor.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xb
9696
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
9797
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
9898
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
99-
github.com/docker/docker v24.0.0-rc.2+incompatible h1:ItFfSgvZ73G/8pg5Yd6XLnif7zpeurAREnRbd7u6v04=
100-
github.com/docker/docker v24.0.0-rc.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
99+
github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible h1:JH72n+pwNXSy/3lBlzKDQ22RcL+tDqVOU5O6m/dLuho=
100+
github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
101101
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
102102
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
103103
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=

vendor/github.com/docker/docker/api/common.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/api/swagger.yaml

Lines changed: 4 additions & 4 deletions
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ github.com/docker/distribution/registry/client/transport
4040
github.com/docker/distribution/registry/storage/cache
4141
github.com/docker/distribution/registry/storage/cache/memory
4242
github.com/docker/distribution/uuid
43-
# github.com/docker/docker v24.0.0-rc.2+incompatible
43+
# github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible => github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible
4444
## explicit
4545
github.com/docker/docker/api
4646
github.com/docker/docker/api/types
@@ -406,3 +406,4 @@ gotest.tools/v3/internal/format
406406
gotest.tools/v3/internal/source
407407
gotest.tools/v3/poll
408408
gotest.tools/v3/skip
409+
# github.com/docker/docker => github.com/docker/docker v24.0.0-rc.2.0.20230506131059-88f4bf4ae4ba+incompatible

0 commit comments

Comments
 (0)