From ac06c971fac8bf0fd46ce84b9b4818f1dec93355 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Mar 2022 14:43:34 +0100 Subject: [PATCH] remove unneeded "digest" alias for "go-digest" This was there for historic reasons (I think `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 --- cli/command/image/trust.go | 2 +- cli/command/manifest/inspect_test.go | 2 +- cli/context/store/store.go | 2 +- cli/manifest/store/store.go | 2 +- cli/registry/client/fetcher.go | 2 +- cli/trust/trust.go | 2 +- cli/trust/trust_test.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/command/image/trust.go b/cli/command/image/trust.go index ac48ca364e..1f240f4fdb 100644 --- a/cli/command/image/trust.go +++ b/cli/command/image/trust.go @@ -16,7 +16,7 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/registry" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/theupdateframework/notary/client" diff --git a/cli/command/manifest/inspect_test.go b/cli/command/manifest/inspect_test.go index 92bfd2e27a..3d59cff8ae 100644 --- a/cli/command/manifest/inspect_test.go +++ b/cli/command/manifest/inspect_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/distribution" "github.com/docker/distribution/manifest/schema2" "github.com/docker/distribution/reference" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" "gotest.tools/v3/assert" diff --git a/cli/context/store/store.go b/cli/context/store/store.go index ff7049e827..5ede61fd83 100644 --- a/cli/context/store/store.go +++ b/cli/context/store/store.go @@ -16,7 +16,7 @@ import ( "strings" "github.com/docker/docker/errdefs" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/cli/manifest/store/store.go b/cli/manifest/store/store.go index dd0c86e526..e4a725deff 100644 --- a/cli/manifest/store/store.go +++ b/cli/manifest/store/store.go @@ -10,7 +10,7 @@ import ( "github.com/docker/cli/cli/manifest/types" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/reference" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/cli/registry/client/fetcher.go b/cli/registry/client/fetcher.go index 678ea2649e..190aada58c 100644 --- a/cli/registry/client/fetcher.go +++ b/cli/registry/client/fetcher.go @@ -14,7 +14,7 @@ import ( v2 "github.com/docker/distribution/registry/api/v2" distclient "github.com/docker/distribution/registry/client" "github.com/docker/docker/registry" - 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/cli/trust/trust.go b/cli/trust/trust.go index dda1c0bb59..0b20597307 100644 --- a/cli/trust/trust.go +++ b/cli/trust/trust.go @@ -21,7 +21,7 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/registry" "github.com/docker/go-connections/tlsconfig" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/theupdateframework/notary" diff --git a/cli/trust/trust_test.go b/cli/trust/trust_test.go index 044e2c2088..7ea117b853 100644 --- a/cli/trust/trust_test.go +++ b/cli/trust/trust_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/docker/distribution/reference" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/theupdateframework/notary/client" "github.com/theupdateframework/notary/passphrase" "github.com/theupdateframework/notary/trustpinning"