From f7faee1d06248fd8cc9606c51feb206e0f349ebf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:21:45 +0000 Subject: [PATCH 1/2] Update module github.com/docker/cli to v27.2.1+incompatible Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 94c1301b9..3f0569da9 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/containers/storage v1.55.0 github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.2.0+incompatible + github.com/docker/cli v27.2.1+incompatible github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker v27.2.1+incompatible github.com/docker/docker-credential-helpers v0.8.2 diff --git a/go.sum b/go.sum index 7939fcb31..2ea3be699 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= -github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.2.1+incompatible h1:U5BPtiD0viUzjGAjV1p0MGB8eVA3L3cbIrnyWmSJI70= +github.com/docker/cli v27.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI= From 8eaef25ebb2469b94d1e265ebbe8080548479e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 9 Sep 2024 21:33:11 +0200 Subject: [PATCH 2/2] Update TestGetCredentialsInteroperability to match docker/cli changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miloslav Trmač --- pkg/docker/config/config_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/docker/config/config_test.go b/pkg/docker/config/config_test.go index 0a02ebb43..03f9290dd 100644 --- a/pkg/docker/config/config_test.go +++ b/pkg/docker/config/config_test.go @@ -482,6 +482,9 @@ func TestGetCredentialsInteroperability(t *testing.T) { if serverAddress == "" { serverAddress = registry.IndexServer } + if serverAddress != registry.IndexServer { + serverAddress = credentials.ConvertToHostname(serverAddress) + } configFile, err := config.Load(configDir) require.NoError(t, err) err = configFile.GetCredentialsStore(serverAddress).Store(configtypes.AuthConfig{