Skip to content

Commit 4a9d78b

Browse files
thaJeztahthaJeztah
committed
migrate to github.com/distribution/reference
The "reference" package was moved to a separate module, which was extracted from distribution/distribution@b9b1940 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 32c3d0a commit 4a9d78b

7 files changed

Lines changed: 24 additions & 88 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ require (
77
github.com/Microsoft/go-winio v0.6.1
88
github.com/adrg/xdg v0.4.0
99
github.com/buger/goterm v1.0.4
10-
github.com/compose-spec/compose-go v1.18.3
10+
github.com/compose-spec/compose-go v1.18.4-0.20230831144607-93259452db49 // temporarily using non-tagged version, to include https://github.com/compose-spec/compose-go/pull/452
1111
github.com/containerd/console v1.0.3
1212
github.com/containerd/containerd v1.7.3
1313
github.com/cucumber/godog v0.0.0-00010101000000-000000000000 // replaced; see replace for the actual version used
14-
github.com/distribution/distribution/v3 v3.0.0-20230601133803-97b1d649c493
14+
github.com/distribution/reference v0.5.0
1515
github.com/docker/buildx v0.11.2
1616
github.com/docker/cli v24.0.5+incompatible
1717
github.com/docker/cli-docs-tool v0.6.0
@@ -67,10 +67,8 @@ require (
6767
github.com/aws/aws-sdk-go-v2/service/sts v1.18.6 // indirect
6868
github.com/aws/smithy-go v1.13.5 // indirect
6969
github.com/beorn7/perks v1.0.1 // indirect
70-
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
7170
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
7271
github.com/cespare/xxhash/v2 v2.2.0 // indirect
73-
github.com/cloudflare/cfssl v1.6.4 // indirect
7472
github.com/containerd/continuity v0.4.1 // indirect
7573
github.com/containerd/typeurl/v2 v2.1.1 // indirect
7674
github.com/cucumber/gherkin-go/v19 v19.0.3 // indirect
@@ -109,13 +107,10 @@ require (
109107
github.com/imdario/mergo v0.3.16 // indirect
110108
github.com/in-toto/in-toto-golang v0.5.0 // indirect
111109
github.com/inconshreveable/mousetrap v1.1.0 // indirect
112-
github.com/jinzhu/gorm v1.9.11 // indirect
113110
github.com/josharian/intern v1.0.0 // indirect
114111
github.com/json-iterator/go v1.1.12 // indirect
115112
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
116113
github.com/klauspost/compress v1.16.5 // indirect
117-
github.com/kr/pretty v0.3.0 // indirect
118-
github.com/magiconair/properties v1.8.6 // indirect
119114
github.com/mailru/easyjson v0.7.6 // indirect
120115
github.com/mattn/go-colorable v0.1.13 // indirect
121116
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -145,16 +140,13 @@ require (
145140
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
146141
github.com/shibumi/go-pathspec v1.3.0 // indirect
147142
github.com/spf13/afero v1.9.2 // indirect
148-
github.com/spf13/cast v1.5.0 // indirect
149-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
150143
github.com/subosito/gotenv v1.4.1 // indirect
151144
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
152145
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
153146
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
154147
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
155148
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
156149
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
157-
github.com/zmap/zcrypto v0.0.0-20220605182715-4dfcec6e9a8c // indirect
158150
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
159151
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0 // indirect
160152
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect

‎go.sum‎

Lines changed: 17 additions & 73 deletions
Large diffs are not rendered by default.

‎pkg/compose/compose.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/docker/docker/api/types/volume"
3232

3333
"github.com/compose-spec/compose-go/types"
34-
"github.com/distribution/distribution/v3/reference"
34+
"github.com/distribution/reference"
3535
"github.com/docker/cli/cli/command"
3636
"github.com/docker/cli/cli/config/configfile"
3737
"github.com/docker/cli/cli/flags"

‎pkg/compose/image_pruner.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sync"
2424

2525
"github.com/compose-spec/compose-go/types"
26-
"github.com/distribution/distribution/v3/reference"
26+
"github.com/distribution/reference"
2727
moby "github.com/docker/docker/api/types"
2828
"github.com/docker/docker/api/types/filters"
2929
"github.com/docker/docker/client"

‎pkg/compose/images.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"sync"
2424

25-
"github.com/distribution/distribution/v3/reference"
25+
"github.com/distribution/reference"
2626
moby "github.com/docker/docker/api/types"
2727
"github.com/docker/docker/api/types/filters"
2828
"github.com/docker/docker/errdefs"

‎pkg/compose/pull.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"strings"
2727

2828
"github.com/compose-spec/compose-go/types"
29-
"github.com/distribution/distribution/v3/reference"
29+
"github.com/distribution/reference"
3030
"github.com/docker/buildx/driver"
3131
moby "github.com/docker/docker/api/types"
3232
"github.com/docker/docker/pkg/jsonmessage"

‎pkg/compose/push.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"io"
2525

2626
"github.com/compose-spec/compose-go/types"
27-
"github.com/distribution/distribution/v3/reference"
27+
"github.com/distribution/reference"
2828
"github.com/docker/buildx/driver"
2929
moby "github.com/docker/docker/api/types"
3030
"github.com/docker/docker/pkg/jsonmessage"

0 commit comments

Comments
 (0)