From f4c6ac26a25ce4ef129b022e8619e91443b30536 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Mon, 9 Jan 2017 11:10:30 +0100 Subject: [PATCH] *: move to opencontainers/go-digest Signed-off-by: Antonio Murdaca --- copy/copy.go | 4 ++-- copy/copy_test.go | 2 +- directory/directory_dest.go | 4 ++-- directory/directory_src.go | 2 +- directory/directory_test.go | 2 +- directory/directory_transport.go | 2 +- docker/daemon/daemon_dest.go | 4 ++-- docker/daemon/daemon_src.go | 2 +- docker/daemon/daemon_transport.go | 4 ++-- docker/daemon/daemon_transport_test.go | 4 ++-- docker/daemon/daemon_types.go | 2 +- docker/docker_image_dest.go | 4 ++-- docker/docker_image_src.go | 2 +- docker/lookaside.go | 2 +- docker/reference/reference.go | 11 +++++------ image/docker_list.go | 2 +- image/docker_schema1.go | 2 +- image/docker_schema2.go | 2 +- image/docker_schema2_test.go | 2 +- image/manifest.go | 2 +- image/oci.go | 2 +- image/oci_test.go | 2 +- manifest/fixtures_info_test.go | 2 +- manifest/manifest.go | 2 +- manifest/manifest_test.go | 10 +++++++--- oci/layout/oci_dest.go | 4 ++-- oci/layout/oci_src.go | 2 +- oci/layout/oci_transport.go | 2 +- openshift/openshift.go | 2 +- signature/docker.go | 2 +- signature/fixtures_info_test.go | 2 +- signature/policy_eval_signedby.go | 2 +- signature/signature.go | 2 +- signature/signature_test.go | 2 +- storage/storage_image.go | 6 +++--- storage/storage_test.go | 2 +- storage/storage_transport.go | 8 ++++---- types/types.go | 2 +- 38 files changed, 60 insertions(+), 57 deletions(-) diff --git a/copy/copy.go b/copy/copy.go index 1267501d..d27e634c 100644 --- a/copy/copy.go +++ b/copy/copy.go @@ -16,7 +16,7 @@ import ( "github.com/containers/image/signature" "github.com/containers/image/transports" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) @@ -59,7 +59,7 @@ func newDigestingReader(source io.Reader, expectedDigest digest.Digest) (*digest } return &digestingReader{ source: source, - digester: digestAlgorithm.New(), + digester: digestAlgorithm.Digester(), expectedDigest: expectedDigest, validationFailed: false, }, nil diff --git a/copy/copy_test.go b/copy/copy_test.go index 51d8c206..feb580dd 100644 --- a/copy/copy_test.go +++ b/copy/copy_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/directory/directory_dest.go b/directory/directory_dest.go index d39536d9..e0b0fe45 100644 --- a/directory/directory_dest.go +++ b/directory/directory_dest.go @@ -6,7 +6,7 @@ import ( "os" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) @@ -69,7 +69,7 @@ func (d *dirImageDestination) PutBlob(stream io.Reader, inputInfo types.BlobInfo } }() - digester := digest.Canonical.New() + digester := digest.Canonical.Digester() tee := io.TeeReader(stream, digester.Hash()) size, err := io.Copy(blobFile, tee) diff --git a/directory/directory_src.go b/directory/directory_src.go index 30ed81b1..8053c189 100644 --- a/directory/directory_src.go +++ b/directory/directory_src.go @@ -7,7 +7,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/directory/directory_test.go b/directory/directory_test.go index 6b4f29e3..2693311c 100644 --- a/directory/directory_test.go +++ b/directory/directory_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/directory/directory_transport.go b/directory/directory_transport.go index 616bee4c..89d2565a 100644 --- a/directory/directory_transport.go +++ b/directory/directory_transport.go @@ -11,7 +11,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/image" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" ) // Transport is an ImageTransport for directory paths. diff --git a/docker/daemon/daemon_dest.go b/docker/daemon/daemon_dest.go index bebe79f9..8368fab2 100644 --- a/docker/daemon/daemon_dest.go +++ b/docker/daemon/daemon_dest.go @@ -14,8 +14,8 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" "github.com/docker/engine-api/client" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "golang.org/x/net/context" ) @@ -170,7 +170,7 @@ func (d *daemonImageDestination) PutBlob(stream io.Reader, inputInfo types.BlobI logrus.Debugf("… streaming done") } - digester := digest.Canonical.New() + digester := digest.Canonical.Digester() tee := io.TeeReader(stream, digester.Hash()) if err := d.sendFile(inputInfo.Digest.String(), inputInfo.Size, tee); err != nil { return types.BlobInfo{}, err diff --git a/docker/daemon/daemon_src.go b/docker/daemon/daemon_src.go index b36ae7cd..5a59cafb 100644 --- a/docker/daemon/daemon_src.go +++ b/docker/daemon/daemon_src.go @@ -11,8 +11,8 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" "github.com/docker/engine-api/client" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/docker/daemon/daemon_transport.go b/docker/daemon/daemon_transport.go index 76c97d1f..c8e40aed 100644 --- a/docker/daemon/daemon_transport.go +++ b/docker/daemon/daemon_transport.go @@ -6,7 +6,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/image" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" ) // Transport is an ImageTransport for images managed by a local Docker daemon. @@ -51,7 +51,7 @@ func ParseReference(refString string) (types.ImageReference, error) { // digest:hexstring is structurally the same as a reponame:tag (meaning docker.io/library/reponame:tag). // reference.ParseIDOrReference interprets such strings as digests. - if dgst, err := digest.ParseDigest(refString); err == nil { + if dgst, err := digest.Parse(refString); err == nil { // The daemon explicitly refuses to tag images with a reponame equal to digest.Canonical - but _only_ this digest name. // Other digest references are ambiguous, so refuse them. if dgst.Algorithm() != digest.Canonical { diff --git a/docker/daemon/daemon_transport_test.go b/docker/daemon/daemon_transport_test.go index d2c874a5..68ad2553 100644 --- a/docker/daemon/daemon_transport_test.go +++ b/docker/daemon/daemon_transport_test.go @@ -5,7 +5,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -108,7 +108,7 @@ var validNamedReferenceTestCases = []struct{ input, dockerRef, stringWithinTrans func TestNewReference(t *testing.T) { // An ID reference. - id, err := digest.ParseDigest(sha256digest) + id, err := digest.Parse(sha256digest) require.NoError(t, err) ref, err := NewReference(id, nil) require.NoError(t, err) diff --git a/docker/daemon/daemon_types.go b/docker/daemon/daemon_types.go index c1bb9caa..03276aea 100644 --- a/docker/daemon/daemon_types.go +++ b/docker/daemon/daemon_types.go @@ -1,6 +1,6 @@ package daemon -import "github.com/docker/distribution/digest" +import "github.com/opencontainers/go-digest" // Various data structures. diff --git a/docker/docker_image_dest.go b/docker/docker_image_dest.go index cda109c2..9761f58e 100644 --- a/docker/docker_image_dest.go +++ b/docker/docker_image_dest.go @@ -13,7 +13,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) @@ -128,7 +128,7 @@ func (d *dockerImageDestination) PutBlob(stream io.Reader, inputInfo types.BlobI return types.BlobInfo{}, errors.Wrap(err, "Error determining upload URL") } - digester := digest.Canonical.New() + digester := digest.Canonical.Digester() sizeCounter := &sizeCounter{} tee := io.TeeReader(stream, io.MultiWriter(digester.Hash(), sizeCounter)) res, err = d.c.makeRequestToResolvedURL("PATCH", uploadLocation.String(), map[string][]string{"Content-Type": {"application/octet-stream"}}, tee, inputInfo.Size, true) diff --git a/docker/docker_image_src.go b/docker/docker_image_src.go index 0ec1518a..563e6aa6 100644 --- a/docker/docker_image_src.go +++ b/docker/docker_image_src.go @@ -13,8 +13,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" "github.com/docker/distribution/registry/client" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/docker/lookaside.go b/docker/lookaside.go index 837261bb..e8f3a5be 100644 --- a/docker/lookaside.go +++ b/docker/lookaside.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/docker/distribution/digest" "github.com/ghodss/yaml" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/Sirupsen/logrus" diff --git a/docker/reference/reference.go b/docker/reference/reference.go index ee201aa5..fb9c0175 100644 --- a/docker/reference/reference.go +++ b/docker/reference/reference.go @@ -4,14 +4,13 @@ import ( "regexp" "strings" - "github.com/pkg/errors" - - // "docker/distribution/digest" requires us to load the algorithms that we + // "opencontainers/go-digest" requires us to load the algorithms that we // want to use into the binary (it calls .Available). _ "crypto/sha256" - "github.com/docker/distribution/digest" distreference "github.com/docker/distribution/reference" + "github.com/opencontainers/go-digest" + "github.com/pkg/errors" ) const ( @@ -131,7 +130,7 @@ func (r *taggedRef) Tag() string { return r.namedRef.Named.(distreference.NamedTagged).Tag() } func (r *canonicalRef) Digest() digest.Digest { - return r.namedRef.Named.(distreference.Canonical).Digest() + return digest.Digest(r.namedRef.Named.(distreference.Canonical).Digest()) } // WithDefaultTag adds a default tag to a reference if it only has a repo name. @@ -159,7 +158,7 @@ func ParseIDOrReference(idOrRef string) (digest.Digest, Named, error) { if err := validateID(idOrRef); err == nil { idOrRef = "sha256:" + idOrRef } - if dgst, err := digest.ParseDigest(idOrRef); err == nil { + if dgst, err := digest.Parse(idOrRef); err == nil { return dgst, nil, nil } ref, err := ParseNamed(idOrRef) diff --git a/image/docker_list.go b/image/docker_list.go index 1a2f6e38..47679415 100644 --- a/image/docker_list.go +++ b/image/docker_list.go @@ -6,7 +6,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/image/docker_schema1.go b/image/docker_schema1.go index db620a8a..dce81a14 100644 --- a/image/docker_schema1.go +++ b/image/docker_schema1.go @@ -9,7 +9,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/image/docker_schema2.go b/image/docker_schema2.go index addc9e5a..a40d53b2 100644 --- a/image/docker_schema2.go +++ b/image/docker_schema2.go @@ -11,7 +11,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/image/docker_schema2_test.go b/image/docker_schema2_test.go index 3220f7f6..6f1f0fbd 100644 --- a/image/docker_schema2_test.go +++ b/image/docker_schema2_test.go @@ -14,7 +14,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/image/manifest.go b/image/manifest.go index df3e23f4..6b82b0be 100644 --- a/image/manifest.go +++ b/image/manifest.go @@ -3,8 +3,8 @@ package image import ( "time" - "github.com/docker/distribution/digest" "github.com/docker/engine-api/types/strslice" + "github.com/opencontainers/go-digest" "github.com/containers/image/manifest" "github.com/containers/image/types" diff --git a/image/oci.go b/image/oci.go index 5ee94e5d..969bb61a 100644 --- a/image/oci.go +++ b/image/oci.go @@ -6,7 +6,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/image/oci_test.go b/image/oci_test.go index 6b273bab..2f89643c 100644 --- a/image/oci_test.go +++ b/image/oci_test.go @@ -14,7 +14,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/manifest/fixtures_info_test.go b/manifest/fixtures_info_test.go index 197a6bfd..2607125b 100644 --- a/manifest/fixtures_info_test.go +++ b/manifest/fixtures_info_test.go @@ -1,6 +1,6 @@ package manifest -import "github.com/docker/distribution/digest" +import "github.com/opencontainers/go-digest" const ( // TestV2S2ManifestDigest is the Docker manifest digest of "v2s2.manifest.json" diff --git a/manifest/manifest.go b/manifest/manifest.go index 0702caa9..430331f0 100644 --- a/manifest/manifest.go +++ b/manifest/manifest.go @@ -3,8 +3,8 @@ package manifest import ( "encoding/json" - "github.com/docker/distribution/digest" "github.com/docker/libtrust" + "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/manifest/manifest_test.go b/manifest/manifest_test.go index 510aa2da..78da71a2 100644 --- a/manifest/manifest_test.go +++ b/manifest/manifest_test.go @@ -5,13 +5,17 @@ import ( "path/filepath" "testing" - "github.com/docker/distribution/digest" "github.com/docker/libtrust" + "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) +const ( + digestSha256EmptyTar = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" +) + func TestGuessMIMEType(t *testing.T) { cases := []struct { path string @@ -61,7 +65,7 @@ func TestDigest(t *testing.T) { actualDigest, err = Digest([]byte{}) require.NoError(t, err) - assert.Equal(t, digest.Digest(digest.DigestSha256EmptyTar), actualDigest) + assert.Equal(t, digest.Digest(digestSha256EmptyTar), actualDigest) } func TestMatchesDigest(t *testing.T) { @@ -98,7 +102,7 @@ func TestMatchesDigest(t *testing.T) { assert.False(t, res) assert.Error(t, err) - res, err = MatchesDigest([]byte{}, digest.Digest(digest.DigestSha256EmptyTar)) + res, err = MatchesDigest([]byte{}, digest.Digest(digestSha256EmptyTar)) assert.True(t, res) assert.NoError(t, err) } diff --git a/oci/layout/oci_dest.go b/oci/layout/oci_dest.go index 77fc7f3b..4f4a12c0 100644 --- a/oci/layout/oci_dest.go +++ b/oci/layout/oci_dest.go @@ -11,7 +11,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" ) @@ -80,7 +80,7 @@ func (d *ociImageDestination) PutBlob(stream io.Reader, inputInfo types.BlobInfo } }() - digester := digest.Canonical.New() + digester := digest.Canonical.Digester() tee := io.TeeReader(stream, digester.Hash()) size, err := io.Copy(blobFile, tee) diff --git a/oci/layout/oci_src.go b/oci/layout/oci_src.go index e1501b94..1b148d27 100644 --- a/oci/layout/oci_src.go +++ b/oci/layout/oci_src.go @@ -8,7 +8,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/oci/layout/oci_transport.go b/oci/layout/oci_transport.go index 810d7923..734af87c 100644 --- a/oci/layout/oci_transport.go +++ b/oci/layout/oci_transport.go @@ -10,7 +10,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/image" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/openshift/openshift.go b/openshift/openshift.go index cb3deb19..1fc0e24c 100644 --- a/openshift/openshift.go +++ b/openshift/openshift.go @@ -16,7 +16,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" "github.com/containers/image/version" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/signature/docker.go b/signature/docker.go index b90da5ff..9f8a40a0 100644 --- a/signature/docker.go +++ b/signature/docker.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/containers/image/manifest" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" ) // SignDockerManifest returns a signature for manifest as the specified dockerReference, diff --git a/signature/fixtures_info_test.go b/signature/fixtures_info_test.go index b2edd308..e9f21f7e 100644 --- a/signature/fixtures_info_test.go +++ b/signature/fixtures_info_test.go @@ -1,6 +1,6 @@ package signature -import "github.com/docker/distribution/digest" +import "github.com/opencontainers/go-digest" const ( // TestImageManifestDigest is the Docker manifest digest of "image.manifest.json" diff --git a/signature/policy_eval_signedby.go b/signature/policy_eval_signedby.go index 21fa51ed..9d914019 100644 --- a/signature/policy_eval_signedby.go +++ b/signature/policy_eval_signedby.go @@ -12,7 +12,7 @@ import ( "github.com/containers/image/manifest" "github.com/containers/image/types" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" ) func (pr *prSignedBy) isSignatureAuthorAccepted(image types.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { diff --git a/signature/signature.go b/signature/signature.go index 2659ff7b..b2705a6d 100644 --- a/signature/signature.go +++ b/signature/signature.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/containers/image/version" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" ) const ( diff --git a/signature/signature_test.go b/signature/signature_test.go index c1617e06..7142d466 100644 --- a/signature/signature_test.go +++ b/signature/signature_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/storage/storage_image.go b/storage/storage_image.go index 36f1917b..4d009464 100644 --- a/storage/storage_image.go +++ b/storage/storage_image.go @@ -16,7 +16,7 @@ import ( "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/ioutils" "github.com/containers/storage/storage" - ddigest "github.com/docker/distribution/digest" + ddigest "github.com/opencontainers/go-digest" ) var ( @@ -150,10 +150,10 @@ func (s *storageImageDestination) PutBlob(stream io.Reader, blobinfo types.BlobI // Set up to read the whole blob (the initial snippet, plus the rest) // while digesting it with either the default, or the passed-in digest, // if one was specified. - hasher := ddigest.Canonical.New() + hasher := ddigest.Canonical.Digester() if digest.Validate() == nil { if a := digest.Algorithm(); a.Available() { - hasher = a.New() + hasher = a.Digester() } } hash := "" diff --git a/storage/storage_test.go b/storage/storage_test.go index fc4f9e63..78dafc15 100644 --- a/storage/storage_test.go +++ b/storage/storage_test.go @@ -22,7 +22,7 @@ import ( "github.com/containers/storage/pkg/ioutils" "github.com/containers/storage/pkg/reexec" "github.com/containers/storage/storage" - ddigest "github.com/docker/distribution/digest" + ddigest "github.com/opencontainers/go-digest" ) var ( diff --git a/storage/storage_transport.go b/storage/storage_transport.go index bb8b2df9..661df103 100644 --- a/storage/storage_transport.go +++ b/storage/storage_transport.go @@ -11,8 +11,8 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/types" "github.com/containers/storage/storage" - "github.com/docker/distribution/digest" - ddigest "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" + ddigest "github.com/opencontainers/go-digest" ) var ( @@ -95,7 +95,7 @@ func (s storageTransport) ParseStoreReference(store storage.Store, ref string) ( return nil, err } } - sum, err = digest.ParseDigest("sha256:" + refInfo[1]) + sum, err = digest.Parse("sha256:" + refInfo[1]) if err != nil { return nil, err } @@ -266,7 +266,7 @@ func (s storageTransport) ValidatePolicyConfigurationScope(scope string) error { if err != nil { return err } - _, err = ddigest.ParseDigest("sha256:" + scopeInfo[1]) + _, err = ddigest.Parse("sha256:" + scopeInfo[1]) if err != nil { return err } diff --git a/types/types.go b/types/types.go index 5ebf2828..517388a0 100644 --- a/types/types.go +++ b/types/types.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/containers/image/docker/reference" - "github.com/docker/distribution/digest" + "github.com/opencontainers/go-digest" ) // ImageTransport is a top-level namespace for ways to to store/load an image.