Merge pull request #4150 from thaJeztah/engine_24.0.0-beta.1

vendor: github.com/docker/docker v24.0.0-beta.1

vendor.mod

@@ -6,23 +6,11 @@ module github.com/docker/cli
 
 go 1.18
 
-// This is github.com/docker/docker "master". Unfortunately, go modules version
-// resolution is very broken, and updating the dependency to "master" without
-// a replace rule will roll it back to v23.0.0-rc.2+incompatible, likely because
-// that version is used by some dependencies (BuildKit, SwarmKit).
-//
-// Why 20.10.3? Go modules generates pseudo versions based on the latest non-
-// pre-release on the branch that "looks like SemVer" (v20.10.2 in this case).
-// Pseudo versions are prefixed with "vMajor.Minor.Patch+1", so the version
-// becomes "v20.10.3-0.20230207102624-b5568723cee5+incompatible" (latest stable
-// (v20.10.2) "+1" (v20.10.3), followed by the commit-date, and sha.
-replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20230330223104-7c93e4a09be1+incompatible
-
 require (
 	github.com/containerd/containerd v1.6.20
 	github.com/creack/pty v1.1.11
 	github.com/docker/distribution v2.8.1+incompatible
-	github.com/docker/docker v23.0.2+incompatible // replaced; currently using master branch (v24.0.0-dev)
+	github.com/docker/docker v24.0.0-beta.1+incompatible
 	github.com/docker/docker-credential-helpers v0.7.0
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.5.0

vendor.sum

@@ -101,8 +101,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xb
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v20.10.3-0.20230330223104-7c93e4a09be1+incompatible h1:DPj58Fm9w777umTlCnFhJBo+sTyW4bVKG9gDBBnvkO4=
-github.com/docker/docker v20.10.3-0.20230330223104-7c93e4a09be1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.0-beta.1+incompatible h1:asqxFz/4xQRqFpQZFbEfNLOZsD1n7ET4m4AN29/rRKM=
+github.com/docker/docker v24.0.0-beta.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=

vendor/modules.txt

@@ -40,7 +40,7 @@ github.com/docker/distribution/registry/client/transport
 github.com/docker/distribution/registry/storage/cache
 github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
-# github.com/docker/docker v23.0.2+incompatible => github.com/docker/docker v20.10.3-0.20230330223104-7c93e4a09be1+incompatible
+# github.com/docker/docker v24.0.0-beta.1+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
@@ -403,4 +403,3 @@ gotest.tools/v3/internal/format
 gotest.tools/v3/internal/source
 gotest.tools/v3/poll
 gotest.tools/v3/skip
-# github.com/docker/docker => github.com/docker/docker v20.10.3-0.20230330223104-7c93e4a09be1+incompatible