github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Replace docker/distribution/reference with containerd/reference/docker

Browse Source 
Since https://github.com/containerd/containerd/pull/3728
The docker/distribution/reference package is copied into containerd core

Signed-off-by: Shengjing Zhu <i@zhsj.me>
This commit is contained in:
Shengjing Zhu 2020-04-16 03:29:43 +08:00
parent d531dc492a
commit 4263229a7b
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/server/helpers.go
View File

@ -28,10 +28,10 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/reference/docker"
"github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/linux/runctypes"
runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
"github.com/docker/distribution/reference"
imagedigest "github.com/opencontainers/go-digest" imagedigest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -146,12 +146,12 @@ func criContainerStateToString(state runtime.ContainerState) string {
} }
// getRepoDigestAngTag returns image repoDigest and repoTag of the named image reference. // getRepoDigestAngTag returns image repoDigest and repoTag of the named image reference.
func getRepoDigestAndTag(namedRef reference.Named, digest imagedigest.Digest, schema1 bool) (string, string) { func getRepoDigestAndTag(namedRef docker.Named, digest imagedigest.Digest, schema1 bool) (string, string) {
var repoTag, repoDigest string var repoTag, repoDigest string
if _, ok := namedRef.(reference.NamedTagged); ok { if _, ok := namedRef.(docker.NamedTagged); ok {
repoTag = namedRef.String() repoTag = namedRef.String()
} }
if _, ok := namedRef.(reference.Canonical); ok { if _, ok := namedRef.(docker.Canonical); ok {
repoDigest = namedRef.String() repoDigest = namedRef.String()
} else if !schema1 { } else if !schema1 {
// digest is not actual repo digest for schema1 image. // digest is not actual repo digest for schema1 image.
@ -170,7 +170,7 @@ func (c *criService) localResolve(refOrID string) (imagestore.Image, error) {
return func(ref string) string { return func(ref string) string {
// ref is not image id, try to resolve it locally. // ref is not image id, try to resolve it locally.
// TODO(random-liu): Handle this error better for debugging. // TODO(random-liu): Handle this error better for debugging.
normalized, err := reference.ParseDockerRef(ref) normalized, err := docker.ParseDockerRef(ref)
if err != nil { if err != nil {
return "" return ""
} }
@ -283,13 +283,13 @@ func toRuntimeAuthConfig(a criconfig.AuthConfig) *runtime.AuthConfig {
func parseImageReferences(refs []string) ([]string, []string) { func parseImageReferences(refs []string) ([]string, []string) {
var tags, digests []string var tags, digests []string
for _, ref := range refs { for _, ref := range refs {
parsed, err := reference.ParseAnyReference(ref) parsed, err := docker.ParseAnyReference(ref)
if err != nil { if err != nil {
continue continue
} }
if _, ok := parsed.(reference.Canonical); ok { if _, ok := parsed.(docker.Canonical); ok {
digests = append(digests, parsed.String()) digests = append(digests, parsed.String())
} else if _, ok := parsed.(reference.Tagged); ok { } else if _, ok := parsed.(docker.Tagged); ok {
tags = append(tags, parsed.String()) tags = append(tags, parsed.String())
} }
} }

4
pkg/server/helpers_test.go
View File

@ -24,9 +24,9 @@ import (
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/reference/docker"
"github.com/containerd/containerd/runtime/linux/runctypes" "github.com/containerd/containerd/runtime/linux/runctypes"
runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/docker/distribution/reference"
imagedigest "github.com/opencontainers/go-digest" imagedigest "github.com/opencontainers/go-digest"
runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -107,7 +107,7 @@ func TestGetRepoDigestAndTag(t *testing.T) {
}, },
} { } {
t.Logf("TestCase %q", desc) t.Logf("TestCase %q", desc)
named, err := reference.ParseDockerRef(test.ref) named, err := docker.ParseDockerRef(test.ref)
assert.NoError(t, err) assert.NoError(t, err)
repoDigest, repoTag := getRepoDigestAndTag(named, digest, test.schema1) repoDigest, repoTag := getRepoDigestAndTag(named, digest, test.schema1)
assert.Equal(t, test.expectedRepoDigest, repoDigest) assert.Equal(t, test.expectedRepoDigest, repoDigest)

2
pkg/server/image_pull.go
View File

@ -31,10 +31,10 @@ import (
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
distribution "github.com/containerd/containerd/reference/docker"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/imgcrypt" "github.com/containerd/imgcrypt"
"github.com/containerd/imgcrypt/images/encryption" "github.com/containerd/imgcrypt/images/encryption"
distribution "github.com/docker/distribution/reference"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/net/context" "golang.org/x/net/context"

8
pkg/util/image.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package util package util
import ( import (
"github.com/docker/distribution/reference" "github.com/containerd/containerd/reference/docker"
) )
// NormalizeImageRef normalizes the image reference following the docker convention. This is added // NormalizeImageRef normalizes the image reference following the docker convention. This is added
@ -27,7 +27,7 @@ import (
// sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa will be returned as // sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa will be returned as
// docker.io/library/busybox@sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa. // docker.io/library/busybox@sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa.
// //
// Deprecated: use github.com/docker/reference.ParseDockerRef() instead // Deprecated: use github.com/containerd/containerd/reference/docker.ParseDockerRef() instead
func NormalizeImageRef(ref string) (reference.Named, error) { func NormalizeImageRef(ref string) (docker.Named, error) {
return reference.ParseDockerRef(ref) return docker.ParseDockerRef(ref)
} }