Skip to content

Commit b38c0f2

Browse files
thaJeztahthaJeztah
committed
replace reference/docker for github.com/distribution/reference v0.5.0
The reference/docker package was a fork of github.com/distribution/distribution, which could not easily be used as a direct dependency, as it brought many other dependencies with it. The "reference' package has now moved to a separate repository, which means we can replace the local fork, and use the upstream implementation again. The new module was extracted from the distribution repository at commit: distribution/distribution@b9b1940 Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 4923470) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 895f104 commit b38c0f2

43 files changed

Lines changed: 1240 additions & 2437 deletions

Some content is hidden

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

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
github.com/containernetworking/plugins v1.2.0
2828
github.com/coreos/go-systemd/v22 v22.5.0
2929
github.com/davecgh/go-spew v1.1.1
30+
github.com/distribution/reference v0.5.0
3031
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
3132
github.com/docker/go-metrics v0.0.1
3233
github.com/docker/go-units v0.5.0

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
252252
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
253253
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
254254
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
255+
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
256+
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
255257
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
256258
github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
257259
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=

‎images/archive/reference.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
"github.com/containerd/containerd/reference"
24-
distref "github.com/containerd/containerd/reference/docker"
24+
distref "github.com/distribution/reference"
2525
"github.com/opencontainers/go-digest"
2626
)
2727

‎integration/client/go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ require (
3434
github.com/containerd/fifo v1.1.0 // indirect
3535
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3636
github.com/davecgh/go-spew v1.1.1 // indirect
37+
github.com/distribution/reference v0.5.0 // indirect
3738
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
3839
github.com/docker/go-units v0.5.0 // indirect
3940
github.com/felixge/httpsnoop v1.0.3 // indirect

‎integration/client/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn
10251025
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
10261026
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
10271027
github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4=
1028+
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
1029+
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
10281030
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
10291031
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
10301032
github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=

‎pkg/cri/sbserver/helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ import (
3939
imagestore "github.com/containerd/containerd/pkg/cri/store/image"
4040
runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
4141
"github.com/containerd/containerd/plugin"
42-
"github.com/containerd/containerd/reference/docker"
4342
"github.com/containerd/containerd/runtime/linux/runctypes"
4443
runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
4544
"github.com/containerd/errdefs"
45+
docker "github.com/distribution/reference"
4646

4747
runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
4848
imagedigest "github.com/opencontainers/go-digest"

‎pkg/cri/sbserver/helpers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ import (
3333
imagestore "github.com/containerd/containerd/pkg/cri/store/image"
3434
"github.com/containerd/containerd/plugin"
3535
"github.com/containerd/containerd/protobuf/types"
36-
"github.com/containerd/containerd/reference/docker"
3736
"github.com/containerd/containerd/runtime/linux/runctypes"
3837
runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
3938
"github.com/containerd/errdefs"
4039
"github.com/containerd/typeurl/v2"
40+
docker "github.com/distribution/reference"
4141

4242
imagedigest "github.com/opencontainers/go-digest"
4343
runtimespec "github.com/opencontainers/runtime-spec/specs-go"

‎pkg/cri/sbserver/image_pull.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ import (
4545
criconfig "github.com/containerd/containerd/pkg/cri/config"
4646
crilabels "github.com/containerd/containerd/pkg/cri/labels"
4747
snpkg "github.com/containerd/containerd/pkg/snapshotters"
48-
distribution "github.com/containerd/containerd/reference/docker"
4948
"github.com/containerd/containerd/remotes/docker"
5049
"github.com/containerd/containerd/remotes/docker/config"
5150
"github.com/containerd/containerd/tracing"
5251
"github.com/containerd/errdefs"
5352
"github.com/containerd/log"
53+
distribution "github.com/distribution/reference"
5454
)
5555

5656
// For image management:

‎pkg/cri/sbserver/podsandbox/helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
criconfig "github.com/containerd/containerd/pkg/cri/config"
3333
imagestore "github.com/containerd/containerd/pkg/cri/store/image"
3434
ctrdutil "github.com/containerd/containerd/pkg/cri/util"
35-
"github.com/containerd/containerd/reference/docker"
3635
"github.com/containerd/log"
36+
docker "github.com/distribution/reference"
3737
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
3838
"github.com/sirupsen/logrus"
3939

‎pkg/cri/sbserver/podsandbox/helpers_test.go‎

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

2525
"github.com/containerd/containerd/oci"
26-
"github.com/containerd/containerd/reference/docker"
26+
docker "github.com/distribution/reference"
2727
imagedigest "github.com/opencontainers/go-digest"
2828
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
2929
"github.com/stretchr/testify/assert"

0 commit comments

Comments
 (0)