From 0f6023a9c31f78de02a5157a2bfb1047cdcf0141 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 7 Dec 2022 23:13:51 +0100 Subject: [PATCH] vendor: github.com/docker/docker v23.0.0-beta.1 Allows us to remove the replace rule, although we probably need to add it back if we want to update to a newer version from the release branch (as go mod doesn't support release branches :(( ). Signed-off-by: Sebastiaan van Stijn --- vendor.mod | 4 +--- vendor.sum | 4 ++-- vendor/modules.txt | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/vendor.mod b/vendor.mod index b7bcd86502..1874ed8a4b 100644 --- a/vendor.mod +++ b/vendor.mod @@ -10,7 +10,7 @@ require ( github.com/containerd/containerd v1.6.10 github.com/creack/pty v1.1.11 github.com/docker/distribution v2.8.1+incompatible - github.com/docker/docker v20.10.21+incompatible // v23.0.0-dev - see "replace" for the actual version + github.com/docker/docker v23.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 @@ -76,5 +76,3 @@ require ( google.golang.org/grpc v1.48.0 // indirect google.golang.org/protobuf v1.28.1 // indirect ) - -replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221201203946-b21e8f72f254+incompatible // 22.06 branch (v23.0.0-dev) diff --git a/vendor.sum b/vendor.sum index cd707bf4c6..f1c6edf7d0 100644 --- a/vendor.sum +++ b/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.20221201203946-b21e8f72f254+incompatible h1:8FgPVL8YxS2BoP+FXhD71U40HVEkYzgaUxBU8GGHEh0= -github.com/docker/docker v20.10.3-0.20221201203946-b21e8f72f254+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v23.0.0-beta.1+incompatible h1:0Xv+AFPWxTbmohdLK57pYRPmefCKthtfRF/qQwXHolg= +github.com/docker/docker v23.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= diff --git a/vendor/modules.txt b/vendor/modules.txt index e528b3c294..0137516cf7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -39,7 +39,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 v20.10.21+incompatible => github.com/docker/docker v20.10.3-0.20221201203946-b21e8f72f254+incompatible +# github.com/docker/docker v23.0.0-beta.1+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types @@ -400,4 +400,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.20221201203946-b21e8f72f254+incompatible