Skip to content

Commit 12bbf07

Browse files
authored
Merge pull request moby#4188 from thaJeztah/switch_reference
migrate to new github.com/distribution/reference v0.5.0
2 parents cbfd402 + 2d3722e commit 12bbf07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1380
-732
lines changed

cache/remotecache/registry/registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/containerd/containerd/content"
88
"github.com/containerd/containerd/remotes/docker"
99
"github.com/containerd/containerd/snapshots"
10-
"github.com/docker/distribution/reference"
10+
"github.com/distribution/reference"
1111
"github.com/moby/buildkit/cache/remotecache"
1212
"github.com/moby/buildkit/session"
1313
"github.com/moby/buildkit/util/compression"

client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"github.com/containerd/containerd/remotes/docker"
3838
"github.com/containerd/containerd/snapshots"
3939
"github.com/containerd/continuity/fs/fstest"
40-
"github.com/docker/distribution/reference"
40+
"github.com/distribution/reference"
4141
intoto "github.com/in-toto/in-toto-golang/in_toto"
4242
controlapi "github.com/moby/buildkit/api/services/control"
4343
"github.com/moby/buildkit/client/llb"

client/llb/source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strconv"
1010
"strings"
1111

12-
"github.com/docker/distribution/reference"
12+
"github.com/distribution/reference"
1313
"github.com/moby/buildkit/solver/pb"
1414
"github.com/moby/buildkit/util/apicaps"
1515
"github.com/moby/buildkit/util/gitutil"

control/control.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
contentapi "github.com/containerd/containerd/api/services/content/v1"
1212
"github.com/containerd/containerd/content"
1313
"github.com/containerd/containerd/services/content/contentserver"
14-
"github.com/docker/distribution/reference"
14+
"github.com/distribution/reference"
1515
"github.com/hashicorp/go-multierror"
1616
"github.com/mitchellh/hashstructure/v2"
1717
controlapi "github.com/moby/buildkit/api/services/control"

exporter/oci/export.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
archiveexporter "github.com/containerd/containerd/images/archive"
1313
"github.com/containerd/containerd/leases"
14-
"github.com/docker/distribution/reference"
14+
"github.com/distribution/reference"
1515
"github.com/moby/buildkit/cache"
1616
cacheconfig "github.com/moby/buildkit/cache/config"
1717
"github.com/moby/buildkit/exporter"

frontend/dockerfile/dockerfile2llb/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"time"
1717

1818
"github.com/containerd/containerd/platforms"
19-
"github.com/docker/distribution/reference"
19+
"github.com/distribution/reference"
2020
"github.com/docker/go-connections/nat"
2121
"github.com/moby/buildkit/client/llb"
2222
"github.com/moby/buildkit/client/llb/imagemetaresolver"

frontend/dockerui/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/containerd/containerd/platforms"
13-
"github.com/docker/distribution/reference"
13+
"github.com/distribution/reference"
1414
controlapi "github.com/moby/buildkit/api/services/control"
1515
"github.com/moby/buildkit/client/llb"
1616
"github.com/moby/buildkit/exporter/containerimage/image"

frontend/dockerui/namedcontext.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"strings"
99

10-
"github.com/docker/distribution/reference"
10+
"github.com/distribution/reference"
1111
"github.com/moby/buildkit/client/llb"
1212
"github.com/moby/buildkit/exporter/containerimage/exptypes"
1313
"github.com/moby/buildkit/exporter/containerimage/image"

frontend/gateway/gateway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"time"
1616

1717
"github.com/containerd/containerd/mount"
18-
"github.com/docker/distribution/reference"
18+
"github.com/distribution/reference"
1919
"github.com/docker/docker/pkg/idtools"
2020
"github.com/gogo/googleapis/google/rpc"
2121
gogotypes "github.com/gogo/protobuf/types"

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ require (
2626
github.com/containerd/stargz-snapshotter/estargz v0.14.3
2727
github.com/containerd/typeurl/v2 v2.1.1
2828
github.com/coreos/go-systemd/v22 v22.5.0
29+
github.com/distribution/reference v0.5.0
2930
github.com/docker/cli v24.0.5+incompatible
30-
github.com/docker/distribution v2.8.2+incompatible
31-
github.com/docker/docker v24.0.0-rc.2.0.20230723142919-afd4805278b4+incompatible // master (v25.0.0-dev)
31+
github.com/docker/docker v24.0.0-rc.2.0.20230905130451-032797ea4bcb+incompatible // master (v25.0.0-dev)
3232
github.com/docker/go-connections v0.4.0
3333
github.com/docker/go-units v0.5.0
3434
github.com/gofrs/flock v0.8.1

0 commit comments

Comments
 (0)