From a0230f3d9a1f650c06142a2865f8aed08e3a7f0d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Mar 2022 14:49:42 +0100 Subject: [PATCH] remove unneeded "digest" alias for "go-digest" I think this was there for historic reasons (may have been goimports expected this, and we used to have a linter that wanted it), but it's not needed, so let's remove it (to make my IDE less complaining about unneeded aliases). Signed-off-by: Sebastiaan van Stijn --- builder/builder-next/adapters/containerimage/pull.go | 2 +- builder/builder-next/adapters/localinlinecache/inlinecache.go | 2 +- builder/builder-next/adapters/snapshot/snapshot.go | 2 +- builder/builder-next/exporter/export.go | 2 +- builder/builder-next/exporter/writer.go | 2 +- builder/builder-next/imagerefchecker/checker.go | 2 +- builder/builder-next/worker/worker.go | 2 +- builder/remotecontext/tarsum.go | 2 +- client/service_create.go | 2 +- client/service_create_test.go | 2 +- daemon/cluster/executor/container/adapter.go | 2 +- daemon/images/image.go | 2 +- daemon/images/image_prune.go | 2 +- daemon/images/image_pull.go | 2 +- daemon/images/service.go | 2 +- daemon/images/store.go | 2 +- daemon/images/store_test.go | 2 +- daemon/list_test.go | 2 +- distribution/config.go | 2 +- distribution/manifest.go | 2 +- distribution/manifest_test.go | 2 +- distribution/metadata/v2_metadata_service.go | 2 +- distribution/metadata/v2_metadata_service_test.go | 2 +- distribution/pull.go | 2 +- distribution/pull_v2.go | 2 +- distribution/pull_v2_test.go | 2 +- distribution/push_v2.go | 2 +- distribution/push_v2_test.go | 2 +- distribution/xfer/download_test.go | 2 +- image/fs.go | 2 +- image/fs_test.go | 2 +- image/image.go | 2 +- image/store.go | 2 +- image/tarexport/load.go | 2 +- image/tarexport/save.go | 2 +- image/v1/imagev1.go | 2 +- integration-cli/docker_cli_build_test.go | 2 +- integration-cli/docker_cli_by_digest_test.go | 2 +- integration-cli/docker_cli_pull_local_test.go | 2 +- integration-cli/docker_cli_pull_test.go | 2 +- integration-cli/docker_cli_save_load_test.go | 2 +- layer/empty_test.go | 2 +- layer/filestore.go | 2 +- layer/filestore_test.go | 2 +- layer/layer.go | 2 +- layer/layer_store.go | 2 +- layer/layer_test.go | 2 +- layer/migration.go | 2 +- layer/ro_layer.go | 2 +- plugin/backend_linux.go | 2 +- plugin/fetch_linux.go | 2 +- plugin/manager.go | 2 +- plugin/manager_linux.go | 2 +- plugin/v2/plugin.go | 2 +- reference/store.go | 2 +- reference/store_test.go | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index 9deb5c21a5..b25312673d 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -37,7 +37,7 @@ import ( "github.com/moby/buildkit/util/leaseutil" "github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/resolver" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/builder/builder-next/adapters/localinlinecache/inlinecache.go b/builder/builder-next/adapters/localinlinecache/inlinecache.go index c5e19ce2d5..406ff83466 100644 --- a/builder/builder-next/adapters/localinlinecache/inlinecache.go +++ b/builder/builder-next/adapters/localinlinecache/inlinecache.go @@ -17,7 +17,7 @@ import ( "github.com/moby/buildkit/session" "github.com/moby/buildkit/solver" "github.com/moby/buildkit/worker" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/builder/builder-next/adapters/snapshot/snapshot.go b/builder/builder-next/adapters/snapshot/snapshot.go index 160778308e..28075f4f6e 100644 --- a/builder/builder-next/adapters/snapshot/snapshot.go +++ b/builder/builder-next/adapters/snapshot/snapshot.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/pkg/idtools" "github.com/moby/buildkit/identity" "github.com/moby/buildkit/snapshot" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/builder/builder-next/exporter/export.go b/builder/builder-next/exporter/export.go index 46503ad1e5..9e60b7f6ad 100644 --- a/builder/builder-next/exporter/export.go +++ b/builder/builder-next/exporter/export.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/reference" "github.com/moby/buildkit/exporter" "github.com/moby/buildkit/exporter/containerimage/exptypes" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/builder/builder-next/exporter/writer.go b/builder/builder-next/exporter/writer.go index 53305caf85..d48fb4419d 100644 --- a/builder/builder-next/exporter/writer.go +++ b/builder/builder-next/exporter/writer.go @@ -9,7 +9,7 @@ import ( "github.com/moby/buildkit/cache" "github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/system" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/builder/builder-next/imagerefchecker/checker.go b/builder/builder-next/imagerefchecker/checker.go index 01dfab37d5..7ab777a9cc 100644 --- a/builder/builder-next/imagerefchecker/checker.go +++ b/builder/builder-next/imagerefchecker/checker.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/moby/buildkit/cache" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) // LayerGetter abstracts away the snapshotter diff --git a/builder/builder-next/worker/worker.go b/builder/builder-next/worker/worker.go index ebf149d351..a595da7ba7 100644 --- a/builder/builder-next/worker/worker.go +++ b/builder/builder-next/worker/worker.go @@ -41,7 +41,7 @@ import ( "github.com/moby/buildkit/util/compression" "github.com/moby/buildkit/util/contentutil" "github.com/moby/buildkit/util/progress" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/builder/remotecontext/tarsum.go b/builder/remotecontext/tarsum.go index 9e8c7d6072..b809cfb78b 100644 --- a/builder/remotecontext/tarsum.go +++ b/builder/remotecontext/tarsum.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/pkg/containerfs" iradix "github.com/hashicorp/go-immutable-radix" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/tonistiigi/fsutil" ) diff --git a/client/service_create.go b/client/service_create.go index a07315f71f..23024d0f8f 100644 --- a/client/service_create.go +++ b/client/service_create.go @@ -9,7 +9,7 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/client/service_create_test.go b/client/service_create_test.go index af6dd65e7f..e7294f8504 100644 --- a/client/service_create_test.go +++ b/client/service_create_test.go @@ -14,7 +14,7 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index 00b47e77ce..54ee6348fb 100644 --- a/daemon/cluster/executor/container/adapter.go +++ b/daemon/cluster/executor/container/adapter.go @@ -26,7 +26,7 @@ import ( "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/log" gogotypes "github.com/gogo/protobuf/types" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/time/rate" diff --git a/daemon/images/image.go b/daemon/images/image.go index 8b96604781..2dd7759900 100644 --- a/daemon/images/image.go +++ b/daemon/images/image.go @@ -14,7 +14,7 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/images/image_prune.go b/daemon/images/image_prune.go index 124a277aea..1d2cd967c3 100644 --- a/daemon/images/image_prune.go +++ b/daemon/images/image_prune.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/images/image_pull.go b/daemon/images/image_pull.go index bb8bce5aaa..d294ea242c 100644 --- a/daemon/images/image_pull.go +++ b/daemon/images/image_pull.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/images/service.go b/daemon/images/service.go index db7cc1d7f6..5c9c76d3ff 100644 --- a/daemon/images/service.go +++ b/daemon/images/service.go @@ -18,7 +18,7 @@ import ( dockerreference "github.com/docker/docker/reference" "github.com/docker/docker/registry" "github.com/docker/libtrust" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sync/singleflight" diff --git a/daemon/images/store.go b/daemon/images/store.go index 2c8d481c50..19122a4ca0 100644 --- a/daemon/images/store.go +++ b/daemon/images/store.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/distribution" "github.com/docker/docker/image" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/images/store_test.go b/daemon/images/store_test.go index cbb723b4a2..ba953878d8 100644 --- a/daemon/images/store_test.go +++ b/daemon/images/store_test.go @@ -13,7 +13,7 @@ import ( "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" "github.com/docker/docker/image" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "go.etcd.io/bbolt" "gotest.tools/v3/assert" diff --git a/daemon/list_test.go b/daemon/list_test.go index e6a7382bff..1db783ff52 100644 --- a/daemon/list_test.go +++ b/daemon/list_test.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/image" "github.com/google/uuid" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/distribution/config.go b/distribution/config.go index ead0bba904..af6a497b98 100644 --- a/distribution/config.go +++ b/distribution/config.go @@ -18,7 +18,7 @@ import ( refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" "github.com/docker/libtrust" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/distribution/manifest.go b/distribution/manifest.go index ff6cf4bcf3..1e8e32cb63 100644 --- a/distribution/manifest.go +++ b/distribution/manifest.go @@ -14,7 +14,7 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/distribution/manifest_test.go b/distribution/manifest_test.go index 3aac85c5fe..2edaa762aa 100644 --- a/distribution/manifest_test.go +++ b/distribution/manifest_test.go @@ -18,7 +18,7 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema2" "github.com/google/go-cmp/cmp/cmpopts" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/distribution/metadata/v2_metadata_service.go b/distribution/metadata/v2_metadata_service.go index 482d2224ea..fe33498554 100644 --- a/distribution/metadata/v2_metadata_service.go +++ b/distribution/metadata/v2_metadata_service.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) // V2MetadataService maps layer IDs to a set of known metadata for diff --git a/distribution/metadata/v2_metadata_service_test.go b/distribution/metadata/v2_metadata_service_test.go index ca54eaed98..94d0f0b9c3 100644 --- a/distribution/metadata/v2_metadata_service_test.go +++ b/distribution/metadata/v2_metadata_service_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func TestV2MetadataService(t *testing.T) { diff --git a/distribution/pull.go b/distribution/pull.go index 829c5fed6a..e86205bf70 100644 --- a/distribution/pull.go +++ b/distribution/pull.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/pkg/progress" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go index 07cc1e5b86..ed7482e063 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -28,7 +28,7 @@ import ( "github.com/docker/docker/pkg/system" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/distribution/pull_v2_test.go b/distribution/pull_v2_test.go index ac42858a7a..0079544c6f 100644 --- a/distribution/pull_v2_test.go +++ b/distribution/pull_v2_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/reference" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/distribution/push_v2.go b/distribution/push_v2.go index 4a58527c8b..4aa4f60175 100644 --- a/distribution/push_v2.go +++ b/distribution/push_v2.go @@ -24,7 +24,7 @@ import ( "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/distribution/push_v2_test.go b/distribution/push_v2_test.go index 99d29f0802..ea7ce00ec8 100644 --- a/distribution/push_v2_test.go +++ b/distribution/push_v2_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/pkg/progress" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func TestGetRepositoryMountCandidates(t *testing.T) { diff --git a/distribution/xfer/download_test.go b/distribution/xfer/download_test.go index 6b2b83d71e..3b4a6a9df9 100644 --- a/distribution/xfer/download_test.go +++ b/distribution/xfer/download_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" ) diff --git a/image/fs.go b/image/fs.go index d996501cc6..9bb99c3b46 100644 --- a/image/fs.go +++ b/image/fs.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/docker/docker/pkg/ioutils" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/image/fs_test.go b/image/fs_test.go index dc2f52cc38..7cc4a2b7fe 100644 --- a/image/fs_test.go +++ b/image/fs_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/image/image.go b/image/image.go index a9db58fd65..5aa60598fc 100644 --- a/image/image.go +++ b/image/image.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/dockerversion" "github.com/docker/docker/layer" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) // ID is the content-addressable ID of an image. diff --git a/image/store.go b/image/store.go index 0666100f73..cad642f506 100644 --- a/image/store.go +++ b/image/store.go @@ -8,7 +8,7 @@ import ( "github.com/docker/distribution/digestset" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/system" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/image/tarexport/load.go b/image/tarexport/load.go index fa7a745cc0..1c5aac627f 100644 --- a/image/tarexport/load.go +++ b/image/tarexport/load.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" "github.com/moby/sys/symlink" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) diff --git a/image/tarexport/save.go b/image/tarexport/save.go index 8725a3fcb5..054a02ba6b 100644 --- a/image/tarexport/save.go +++ b/image/tarexport/save.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/layer" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/system" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/image/v1/imagev1.go b/image/v1/imagev1.go index 1eec8dfc8c..c341ceaa77 100644 --- a/image/v1/imagev1.go +++ b/image/v1/imagev1.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/stringid" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 34f61b450f..7bcb488af0 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/testutil/fakegit" "github.com/docker/docker/testutil/fakestorage" "github.com/moby/buildkit/frontend/dockerfile/command" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index 34552253c9..464bed047d 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index 489ca504fe..9037ca74f8 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/integration-cli/cli/build" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index 9606d7a903..e0f3639087 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index eac6fb054c..5bbd440b3c 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -16,7 +16,7 @@ import ( "time" "github.com/docker/docker/integration-cli/cli/build" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" diff --git a/layer/empty_test.go b/layer/empty_test.go index ceeb6c04eb..1feb3511e5 100644 --- a/layer/empty_test.go +++ b/layer/empty_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func TestEmptyLayer(t *testing.T) { diff --git a/layer/filestore.go b/layer/filestore.go index 37bc41d514..97307c24fa 100644 --- a/layer/filestore.go +++ b/layer/filestore.go @@ -13,7 +13,7 @@ import ( "github.com/docker/distribution" "github.com/docker/docker/pkg/ioutils" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/layer/filestore_test.go b/layer/filestore_test.go index 926260aca0..c0e6010722 100644 --- a/layer/filestore_test.go +++ b/layer/filestore_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/docker/docker/pkg/stringid" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func randomLayerID(seed int64) ChainID { diff --git a/layer/layer.go b/layer/layer.go index ae74f36b2b..f5a4792498 100644 --- a/layer/layer.go +++ b/layer/layer.go @@ -16,7 +16,7 @@ import ( "github.com/docker/distribution" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/containerfs" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) diff --git a/layer/layer_store.go b/layer/layer_store.go index fbdd074a4d..974edd201e 100644 --- a/layer/layer_store.go +++ b/layer/layer_store.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" "github.com/moby/locker" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" diff --git a/layer/layer_test.go b/layer/layer_test.go index ce90d37421..25ccfeb354 100644 --- a/layer/layer_test.go +++ b/layer/layer_test.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/stringid" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) func init() { diff --git a/layer/migration.go b/layer/migration.go index 80f0ff7ff4..3e6bd27cef 100644 --- a/layer/migration.go +++ b/layer/migration.go @@ -6,7 +6,7 @@ import ( "io" "os" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" diff --git a/layer/ro_layer.go b/layer/ro_layer.go index f4122a7fa9..cf2f08a958 100644 --- a/layer/ro_layer.go +++ b/layer/ro_layer.go @@ -6,7 +6,7 @@ import ( "runtime" "github.com/docker/distribution" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ) type roLayer struct { diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go index 1fe67aa82e..be1cf73c31 100644 --- a/plugin/backend_linux.go +++ b/plugin/backend_linux.go @@ -33,7 +33,7 @@ import ( "github.com/docker/docker/pkg/stringid" v2 "github.com/docker/docker/plugin/v2" "github.com/moby/sys/mount" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/plugin/fetch_linux.go b/plugin/fetch_linux.go index 8ec85f9f36..fe00e88874 100644 --- a/plugin/fetch_linux.go +++ b/plugin/fetch_linux.go @@ -18,7 +18,7 @@ import ( "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/stringid" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/plugin/manager.go b/plugin/manager.go index d9515b9243..f126cd7a03 100644 --- a/plugin/manager.go +++ b/plugin/manager.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/pkg/pubsub" v2 "github.com/docker/docker/plugin/v2" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go index 4156eadf94..166abbb120 100644 --- a/plugin/manager_linux.go +++ b/plugin/manager_linux.go @@ -18,7 +18,7 @@ import ( "github.com/docker/docker/pkg/stringid" v2 "github.com/docker/docker/plugin/v2" "github.com/moby/sys/mount" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/plugin/v2/plugin.go b/plugin/v2/plugin.go index d42e1bd0b9..522adeb4de 100644 --- a/plugin/v2/plugin.go +++ b/plugin/v2/plugin.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/reference/store.go b/reference/store.go index d6ef6697f5..b942c42ca2 100644 --- a/reference/store.go +++ b/reference/store.go @@ -10,7 +10,7 @@ import ( "github.com/docker/distribution/reference" "github.com/docker/docker/pkg/ioutils" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/reference/store_test.go b/reference/store_test.go index a2fdfdb75e..c3098ddf0b 100644 --- a/reference/store_test.go +++ b/reference/store_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/docker/distribution/reference" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" )