Skip to content

Commit

Permalink
[docker] Switch from github.com/docker/distribution/reference to gith…
Browse files Browse the repository at this point in the history 
…ub.com/distribution/reference
  • Loading branch information
@geropl
geropl committed Jan 16, 2025
1 parent 2ca95b0 commit 5c3f05d
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion components/blobserve/cmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions components/blobserve/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/blobserve/pkg/blobserve/blobserve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion components/blobserve/pkg/blobserve/refstore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions components/ide-service/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions components/ide-service/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/ide-service/pkg/ocitool/resolve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion components/image-builder-bob/cmd/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion components/image-builder-bob/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions components/image-builder-bob/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/registry-facade/cmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion components/registry-facade/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/registry-facade/pkg/registry/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5c3f05d

Please sign in to comment.