From f558fd8b22530789167d44e394ea5f18f7e34c7e Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Mon, 22 May 2023 09:23:12 +0100 Subject: [PATCH] vendor: use docker/distribution instead of distribution/distribution This doesn't require pulling in a new direct dependency, we already use docker/distribution throughout imagetools and build. Signed-off-by: Justin Chadwell --- go.mod | 2 +- tests/integration_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 9c0e81be..c10aa3f3 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/containerd/containerd v1.7.0 github.com/containerd/continuity v0.3.0 github.com/containerd/typeurl/v2 v2.1.0 - github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa github.com/docker/cli v24.0.0+incompatible github.com/docker/cli-docs-tool v0.5.1 github.com/docker/distribution v2.8.2+incompatible @@ -87,6 +86,7 @@ require ( github.com/containerd/ttrpc v1.2.1 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect github.com/docker/go-connections v0.4.0 // indirect diff --git a/tests/integration_test.go b/tests/integration_test.go index 42270c82..b54be788 100644 --- a/tests/integration_test.go +++ b/tests/integration_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/distribution/distribution/v3/reference" "github.com/docker/buildx/tests/workers" + "github.com/docker/distribution/reference" "github.com/moby/buildkit/util/testutil/integration" )