From 7d4450dbb51478dd9741aca1f3303e16173f5449 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 21 Nov 2022 14:59:17 +0100 Subject: [PATCH] vendor: docker 394f6c14add7c1a5a80257c9111f43b7edc78d0b / v22.06-dev no changes to vendored code, just syncing with latest full diff: https://github.com/docker/docker/compare/d15be0c54de92a4d868ebd66dbb1065e264554f2...394f6c14add7c1a5a80257c9111f43b7edc78d0b Signed-off-by: Sebastiaan van Stijn --- vendor.mod | 2 +- vendor.sum | 4 ++-- vendor/modules.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vendor.mod b/vendor.mod index a701cbd2fe..711f8251f4 100644 --- a/vendor.mod +++ b/vendor.mod @@ -77,7 +77,7 @@ require ( ) replace ( - github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221117094850-d15be0c54de9+incompatible // 22.06 branch (v22.06-dev) + github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221120201202-394f6c14add7+incompatible // 22.06 branch (v22.06-dev) // Resolve dependency hell with github.com/cloudflare/cfssl (transitive via // swarmkit) by pinning the certificate-transparency-go version. Remove once diff --git a/vendor.sum b/vendor.sum index 725ebc91d2..b9537b64cb 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.20221117094850-d15be0c54de9+incompatible h1:148CEtil9pdujrgsujs9P1PglhnefnHjp7BqoDB6sF4= -github.com/docker/docker v20.10.3-0.20221117094850-d15be0c54de9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.3-0.20221120201202-394f6c14add7+incompatible h1:zy5VzGauXEaYCGQZLMPZZ5TOPn1FcQFfrA73wqH9jsc= +github.com/docker/docker v20.10.3-0.20221120201202-394f6c14add7+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 384e329da4..9e6ddc18fa 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.20221117094850-d15be0c54de9+incompatible +# github.com/docker/docker v20.10.21+incompatible => github.com/docker/docker v20.10.3-0.20221120201202-394f6c14add7+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types @@ -398,5 +398,5 @@ 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.20221117094850-d15be0c54de9+incompatible +# github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221120201202-394f6c14add7+incompatible # github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20