From 5c3f05d8d66a195ed9d6276ab1b9acc98efab88e Mon Sep 17 00:00:00 2001 From: Gero Posmyk-Leinemann Date: Thu, 16 Jan 2025 16:18:29 +0000 Subject: [PATCH] [docker] Switch from github.com/docker/distribution/reference to github.com/distribution/reference --- components/blobserve/cmd/run.go | 2 +- components/blobserve/go.mod | 4 ++-- components/blobserve/pkg/blobserve/blobserve.go | 2 +- components/blobserve/pkg/blobserve/refstore.go | 2 +- components/ide-service/go.mod | 3 +-- components/ide-service/go.sum | 2 -- components/ide-service/pkg/ocitool/resolve.go | 2 +- components/image-builder-bob/cmd/proxy.go | 2 +- components/image-builder-bob/go.mod | 3 ++- components/image-builder-bob/go.sum | 2 ++ components/registry-facade/cmd/run.go | 2 +- components/registry-facade/go.mod | 2 +- components/registry-facade/pkg/registry/registry.go | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/blobserve/cmd/run.go b/components/blobserve/cmd/run.go index b1dc6b82b9cafd..8bebedcfacb8cc 100644 --- a/components/blobserve/cmd/run.go +++ b/components/blobserve/cmd/run.go @@ -17,8 +17,8 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/distribution/reference" "github.com/docker/cli/cli/config/configfile" - "github.com/docker/distribution/reference" blobserve_config "github.com/gitpod-io/gitpod/blobserve/pkg/config" "github.com/heptiolabs/healthcheck" "github.com/prometheus/client_golang/prometheus" diff --git a/components/blobserve/go.mod b/components/blobserve/go.mod index 972d405cf7926b..1cda7499185990 100644 --- a/components/blobserve/go.mod +++ b/components/blobserve/go.mod @@ -4,8 +4,8 @@ go 1.22 require ( github.com/containerd/containerd v1.6.36 + github.com/distribution/reference v0.5.0 github.com/docker/cli v25.0.1+incompatible - github.com/docker/distribution v2.8.3+incompatible github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000 github.com/gitpod-io/gitpod/registry-facade v0.0.0-00010101000000-000000000000 github.com/google/go-cmp v0.6.0 @@ -29,7 +29,7 @@ require ( github.com/crackcomm/go-gitignore v0.0.0-20231225121904-e25f5bc08668 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/distribution/reference v0.5.0 // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.0 // indirect github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect diff --git a/components/blobserve/pkg/blobserve/blobserve.go b/components/blobserve/pkg/blobserve/blobserve.go index 502766685be4e2..4e43ffda91015e 100644 --- a/components/blobserve/pkg/blobserve/blobserve.go +++ b/components/blobserve/pkg/blobserve/blobserve.go @@ -20,7 +20,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/remotes" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/gorilla/mux" "golang.org/x/xerrors" diff --git a/components/blobserve/pkg/blobserve/refstore.go b/components/blobserve/pkg/blobserve/refstore.go index 45e77ece1c0fe8..f01b282ba3789b 100644 --- a/components/blobserve/pkg/blobserve/refstore.go +++ b/components/blobserve/pkg/blobserve/refstore.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/remotes" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/xerrors" diff --git a/components/ide-service/go.mod b/components/ide-service/go.mod index bdb87f9060cb14..2983fa5ed3d6db 100644 --- a/components/ide-service/go.mod +++ b/components/ide-service/go.mod @@ -4,8 +4,8 @@ go 1.22 require ( github.com/containerd/containerd v1.6.36 + github.com/distribution/reference v0.5.0 github.com/docker/cli v25.0.1+incompatible - github.com/docker/distribution v2.8.3+incompatible github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000 github.com/gitpod-io/gitpod/gitpod-protocol v0.0.0-00010101000000-000000000000 github.com/gitpod-io/gitpod/ide-service-api v0.0.0-00010101000000-000000000000 @@ -29,7 +29,6 @@ require ( github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/distribution/reference v0.5.0 // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/frankban/quicktest v1.11.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect diff --git a/components/ide-service/go.sum b/components/ide-service/go.sum index ee613e91bf78fe..3dc54026ef51fc 100644 --- a/components/ide-service/go.sum +++ b/components/ide-service/go.sum @@ -31,8 +31,6 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbTO1lpcGSkU= github.com/docker/cli v25.0.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-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= diff --git a/components/ide-service/pkg/ocitool/resolve.go b/components/ide-service/pkg/ocitool/resolve.go index 252791d983402d..499f406a765fd1 100644 --- a/components/ide-service/pkg/ocitool/resolve.go +++ b/components/ide-service/pkg/ocitool/resolve.go @@ -12,7 +12,7 @@ import ( "time" "github.com/containerd/containerd/remotes" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/components/image-builder-bob/cmd/proxy.go b/components/image-builder-bob/cmd/proxy.go index 3b21b84faba6cc..238f56eecc2475 100644 --- a/components/image-builder-bob/cmd/proxy.go +++ b/components/image-builder-bob/cmd/proxy.go @@ -10,7 +10,7 @@ import ( "os" "github.com/containerd/containerd/remotes/docker" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/spf13/cobra" log "github.com/gitpod-io/gitpod/common-go/log" diff --git a/components/image-builder-bob/go.mod b/components/image-builder-bob/go.mod index e0a65d3de3b485..1e4042f2d70a52 100644 --- a/components/image-builder-bob/go.mod +++ b/components/image-builder-bob/go.mod @@ -5,8 +5,8 @@ go 1.22 require ( github.com/containerd/console v1.0.3 github.com/containerd/containerd v1.6.36 + github.com/distribution/reference v0.6.0 github.com/docker/cli v24.0.4+incompatible - github.com/docker/distribution v2.8.2+incompatible github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000 github.com/google/go-containerregistry v0.19.0 github.com/hashicorp/go-retryablehttp v0.7.2 @@ -29,6 +29,7 @@ require ( github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/containerd/typeurl v1.0.2 // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v24.0.0+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/gitpod-io/gitpod/components/scrubber v0.0.0-00010101000000-000000000000 // indirect diff --git a/components/image-builder-bob/go.sum b/components/image-builder-bob/go.sum index f03c5af729671b..d4c91aef9a3843 100644 --- a/components/image-builder-bob/go.sum +++ b/components/image-builder-bob/go.sum @@ -46,6 +46,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/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 v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw= github.com/docker/cli v24.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= diff --git a/components/registry-facade/cmd/run.go b/components/registry-facade/cmd/run.go index 22e1e0ce8a5fb6..4b2937ce6a2f2f 100644 --- a/components/registry-facade/cmd/run.go +++ b/components/registry-facade/cmd/run.go @@ -17,8 +17,8 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/distribution/reference" "github.com/docker/cli/cli/config/configfile" - "github.com/docker/distribution/reference" "github.com/heptiolabs/healthcheck" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" diff --git a/components/registry-facade/go.mod b/components/registry-facade/go.mod index a8f7ae9badd43d..57cbaaf4c93344 100644 --- a/components/registry-facade/go.mod +++ b/components/registry-facade/go.mod @@ -5,6 +5,7 @@ go 1.22 require ( github.com/alicebob/miniredis/v2 v2.32.1 github.com/containerd/containerd v1.6.36 + github.com/distribution/reference v0.5.0 github.com/docker/cli v25.0.1+incompatible github.com/docker/distribution v2.8.3+incompatible github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000 @@ -65,7 +66,6 @@ require ( github.com/dgraph-io/badger v1.6.2 // indirect github.com/dgraph-io/ristretto v0.0.2 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/distribution/reference v0.5.0 // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect diff --git a/components/registry-facade/pkg/registry/registry.go b/components/registry-facade/pkg/registry/registry.go index 7537a317ab50f6..d03d84bf5080f1 100644 --- a/components/registry-facade/pkg/registry/registry.go +++ b/components/registry-facade/pkg/registry/registry.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/content/local" "github.com/containerd/containerd/remotes" + "github.com/distribution/reference" "github.com/docker/distribution" - "github.com/docker/distribution/reference" "github.com/docker/distribution/registry/api/errcode" distv2 "github.com/docker/distribution/registry/api/v2" "github.com/golang/protobuf/jsonpb"