Skip to content

Commit 4543e32

Browse files
dmcgowandmcgowan
authored
Merge pull request #2986 from thaJeztah/remove_normalize_image_ref
Use distribution's reference.ParseDockerRef
2 parents 0922c69 + 525802f commit 4543e32

6 files changed

Lines changed: 60 additions & 22 deletions

File tree

‎images/archive/reference.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package archive
1919
import (
2020
"strings"
2121

22-
"github.com/containerd/cri/pkg/util"
23-
digest "github.com/opencontainers/go-digest"
22+
"github.com/docker/distribution/reference"
23+
"github.com/opencontainers/go-digest"
2424
"github.com/pkg/errors"
2525
)
2626

@@ -69,7 +69,7 @@ func isImagePrefix(s, prefix string) bool {
6969

7070
func normalizeReference(ref string) (string, error) {
7171
// TODO: Replace this function to not depend on reference package
72-
normalized, err := util.NormalizeImageRef(ref)
72+
normalized, err := reference.ParseDockerRef(ref)
7373
if err != nil {
7474
return "", errors.Wrapf(err, "normalize image ref %q", ref)
7575
}

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ github.com/blang/semver v3.1.0
4949
github.com/containernetworking/cni v0.6.0
5050
github.com/containernetworking/plugins v0.7.0
5151
github.com/davecgh/go-spew v1.1.0
52-
github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
52+
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
5353
github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
5454
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
5555
github.com/emicklei/go-restful v2.2.1

‎vendor/github.com/docker/distribution/README.md‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/distribution/reference/normalize.go‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/distribution/reference/reference.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/distribution/vendor.conf‎

Lines changed: 24 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)