From 9322297b073def602e61f5935b8a33b5a6b84911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20Fern=C3=A1ndez=20Campo?= Date: Tue, 17 Sep 2024 02:19:22 +0200 Subject: [PATCH] Remove deprecated version of docker/reference as its conflicting with a helm client library (#359) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Joaquín Fernández Campo --- go.mod | 4 ++-- go.sum | 4 ++-- internal/dctr/run.go | 2 +- pkg/registry/registry.go | 2 +- pkg/registry/registry_test.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index a13803d..bac2bf1 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ toolchain go1.22.4 require ( github.com/blang/semver/v4 v4.0.0 + github.com/distribution/reference v0.6.0 github.com/docker/cli v27.1.1+incompatible - github.com/docker/distribution v2.8.2+incompatible github.com/docker/docker v27.1.1+incompatible github.com/docker/go-connections v0.4.0 github.com/google/go-cmp v0.6.0 @@ -44,7 +44,7 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/denisbrodbeck/machineid v1.0.1 // indirect - github.com/distribution/reference v0.6.0 // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.3 // indirect github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect github.com/docker/go-metrics v0.0.1 // indirect diff --git a/go.sum b/go.sum index f70dae7..fa92a76 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +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.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= diff --git a/internal/dctr/run.go b/internal/dctr/run.go index 8cca733..8960880 100644 --- a/internal/dctr/run.go +++ b/internal/dctr/run.go @@ -7,7 +7,7 @@ import ( "github.com/docker/cli/cli/command" cliflags "github.com/docker/cli/cli/flags" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index c8a9e74..70a6221 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" diff --git a/pkg/registry/registry_test.go b/pkg/registry/registry_test.go index 3964475..56084ed 100644 --- a/pkg/registry/registry_test.go +++ b/pkg/registry/registry_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image"