From 07ff4f1de895dd760aec11f55bc6c4ca2175cef1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 5 Aug 2019 16:37:47 +0200 Subject: [PATCH] goimports: fix imports Format the source according to latest goimports. Signed-off-by: Kir Kolyshkin Signed-off-by: Sebastiaan van Stijn --- api/server/router/distribution/distribution_routes.go | 2 +- api/server/router/system/system.go | 2 +- api/types/container/host_config.go | 2 +- api/types/registry/registry.go | 2 +- builder/builder-next/adapters/containerimage/pull.go | 2 +- builder/dockerfile/copy_windows.go | 2 +- builder/dockerfile/metrics.go | 2 +- builder/remotecontext/tarsum.go | 2 +- client/image_build_test.go | 2 +- client/service_create.go | 2 +- client/service_create_test.go | 4 ++-- cmd/dockerd/config_unix.go | 2 +- cmd/dockerd/metrics.go | 2 +- container/container.go | 2 +- container/state.go | 2 +- container/view.go | 2 +- daemon/cluster/controllers/plugin/controller.go | 2 +- daemon/cluster/controllers/plugin/controller_test.go | 2 +- daemon/cluster/executor/container/adapter.go | 2 +- daemon/config/config_unix.go | 2 +- daemon/config/config_unix_test.go | 2 +- daemon/events/metrics.go | 2 +- daemon/exec.go | 2 +- daemon/exec_linux.go | 2 +- daemon/exec_linux_test.go | 2 +- daemon/graphdriver/btrfs/btrfs.go | 2 +- daemon/graphdriver/devmapper/deviceset.go | 2 +- daemon/graphdriver/devmapper/driver.go | 2 +- daemon/graphdriver/graphtest/graphtest_unix.go | 2 +- daemon/graphdriver/overlay2/overlay.go | 2 +- daemon/graphdriver/plugin.go | 2 +- daemon/graphdriver/vfs/driver.go | 2 +- daemon/graphdriver/windows/windows.go | 2 +- daemon/images/image_prune.go | 2 +- daemon/images/image_pull.go | 2 +- daemon/images/locals.go | 2 +- daemon/images/service.go | 2 +- daemon/info.go | 2 +- daemon/list_test.go | 2 +- daemon/listeners/listeners_windows.go | 2 +- daemon/logger/factory.go | 2 +- daemon/logger/fluentd/fluentd.go | 2 +- daemon/logger/jsonfilelog/jsonfilelog.go | 2 +- daemon/logger/local/local.go | 2 +- daemon/logger/metrics.go | 2 +- daemon/metrics.go | 2 +- daemon/metrics_unix.go | 4 ++-- daemon/nvidia_linux.go | 2 +- daemon/oci_linux.go | 2 +- daemon/oci_utils.go | 2 +- daemon/oci_windows.go | 2 +- daemon/oci_windows_test.go | 2 +- daemon/seccomp_linux.go | 2 +- daemon/selinux_linux.go | 2 +- daemon/top_windows.go | 2 +- daemon/update_linux.go | 2 +- distribution/config.go | 2 +- distribution/errors.go | 2 +- distribution/errors_test.go | 2 +- distribution/metadata/v1_id_service.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/store_test.go | 2 +- image/tarexport/load.go | 4 ++-- image/tarexport/save.go | 4 ++-- image/v1/imagev1.go | 2 +- integration-cli/docker_cli_build_test.go | 2 +- integration-cli/docker_cli_build_unix_test.go | 2 +- integration-cli/docker_cli_by_digest_test.go | 2 +- integration-cli/docker_cli_daemon_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_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 +- libcontainerd/remote/client_linux.go | 2 +- libcontainerd/types/types.go | 2 +- libcontainerd/types/types_linux.go | 2 +- oci/defaults.go | 2 +- oci/devices_linux.go | 2 +- oci/namespaces.go | 2 +- opts/opts.go | 2 +- opts/ulimit.go | 2 +- opts/ulimit_test.go | 2 +- pkg/jsonmessage/jsonmessage.go | 2 +- pkg/parsers/kernel/kernel_darwin.go | 2 +- pkg/parsers/operatingsystem/operatingsystem_linux.go | 2 +- pkg/system/meminfo_linux.go | 2 +- pkg/system/meminfo_unix_test.go | 2 +- pkg/term/term_windows.go | 2 +- pkg/term/windows/windows.go | 2 +- plugin/backend_linux.go | 4 ++-- plugin/blobstore.go | 2 +- plugin/defs.go | 4 ++-- plugin/executor/containerd/containerd.go | 2 +- plugin/manager.go | 6 +++--- plugin/manager_linux.go | 4 ++-- plugin/manager_linux_test.go | 4 ++-- plugin/manager_windows.go | 2 +- plugin/store.go | 4 ++-- plugin/store_test.go | 2 +- plugin/v2/plugin.go | 4 ++-- plugin/v2/plugin_linux.go | 2 +- plugin/v2/plugin_unsupported.go | 2 +- reference/store.go | 2 +- reference/store_test.go | 2 +- registry/session.go | 1 + rootless/specconv/specconv_linux.go | 2 +- testutil/registry/registry.go | 2 +- testutil/request/npipe_windows.go | 2 +- 125 files changed, 137 insertions(+), 136 deletions(-) diff --git a/api/server/router/distribution/distribution_routes.go b/api/server/router/distribution/distribution_routes.go index d285728382..6e5ee2d80c 100644 --- a/api/server/router/distribution/distribution_routes.go +++ b/api/server/router/distribution/distribution_routes.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/errdefs" - "github.com/opencontainers/image-spec/specs-go/v1" + v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/api/server/router/system/system.go b/api/server/router/system/system.go index 459ee50bf7..4c3c039f04 100644 --- a/api/server/router/system/system.go +++ b/api/server/router/system/system.go @@ -2,7 +2,7 @@ package system // import "github.com/docker/docker/api/server/router/system" import ( "github.com/docker/docker/api/server/router" - "github.com/docker/docker/builder/builder-next" + buildkit "github.com/docker/docker/builder/builder-next" "github.com/docker/docker/builder/fscache" ) diff --git a/api/types/container/host_config.go b/api/types/container/host_config.go index 654c88106c..209f33eb91 100644 --- a/api/types/container/host_config.go +++ b/api/types/container/host_config.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/strslice" "github.com/docker/go-connections/nat" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) // CgroupnsMode represents the cgroup namespace mode of the container diff --git a/api/types/registry/registry.go b/api/types/registry/registry.go index 8789ad3b32..53e47084c8 100644 --- a/api/types/registry/registry.go +++ b/api/types/registry/registry.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net" - "github.com/opencontainers/image-spec/specs-go/v1" + v1 "github.com/opencontainers/image-spec/specs-go/v1" ) // ServiceConfig stores daemon registry services configuration. diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index 729ef52ae8..bc736188f3 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/progress" "github.com/moby/buildkit/util/resolver" "github.com/moby/buildkit/util/tracing" - "github.com/opencontainers/go-digest" + 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/dockerfile/copy_windows.go b/builder/dockerfile/copy_windows.go index 59c1a4b7c3..82e801ae4c 100644 --- a/builder/dockerfile/copy_windows.go +++ b/builder/dockerfile/copy_windows.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/Microsoft/go-winio" + winio "github.com/Microsoft/go-winio" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/system" diff --git a/builder/dockerfile/metrics.go b/builder/dockerfile/metrics.go index ceafa7ad62..eb5b5562f3 100644 --- a/builder/dockerfile/metrics.go +++ b/builder/dockerfile/metrics.go @@ -1,7 +1,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( - "github.com/docker/go-metrics" + metrics "github.com/docker/go-metrics" ) var ( diff --git a/builder/remotecontext/tarsum.go b/builder/remotecontext/tarsum.go index b809cfb78b..9e8c7d6072 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/tonistiigi/fsutil" ) diff --git a/client/image_build_test.go b/client/image_build_test.go index 6cc14145ac..353bc12eb1 100644 --- a/client/image_build_test.go +++ b/client/image_build_test.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/errdefs" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) func TestImageBuildError(t *testing.T) { diff --git a/client/service_create.go b/client/service_create.go index 620fc6cff7..56bfe55b71 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" - "github.com/opencontainers/go-digest" + 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 df836ae2af..ef792a38e2 100644 --- a/client/service_create_test.go +++ b/client/service_create_test.go @@ -14,8 +14,8 @@ import ( registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/errdefs" - "github.com/opencontainers/go-digest" - "github.com/opencontainers/image-spec/specs-go/v1" + digest "github.com/opencontainers/go-digest" + v1 "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go index 4be15b329a..1817c1da27 100644 --- a/cmd/dockerd/config_unix.go +++ b/cmd/dockerd/config_unix.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/daemon/config" "github.com/docker/docker/opts" "github.com/docker/docker/rootless" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/cmd/dockerd/metrics.go b/cmd/dockerd/metrics.go index 1bfa37ea82..2b3c90578e 100644 --- a/cmd/dockerd/metrics.go +++ b/cmd/dockerd/metrics.go @@ -4,7 +4,7 @@ import ( "net" "net/http" - "github.com/docker/go-metrics" + metrics "github.com/docker/go-metrics" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/container/container.go b/container/container.go index 71a8a1b42c..031ee974dc 100644 --- a/container/container.go +++ b/container/container.go @@ -36,7 +36,7 @@ import ( "github.com/docker/docker/restartmanager" "github.com/docker/docker/volume" volumemounts "github.com/docker/docker/volume/mounts" - "github.com/docker/go-units" + units "github.com/docker/go-units" agentexec "github.com/docker/swarmkit/agent/exec" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/container/state.go b/container/state.go index 59eafc9171..11f8e48283 100644 --- a/container/state.go +++ b/container/state.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/api/types" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) // State holds the current container state, and has methods to get and diff --git a/container/view.go b/container/view.go index aabb01923d..962a20b9e1 100644 --- a/container/view.go +++ b/container/view.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - "github.com/hashicorp/go-memdb" + memdb "github.com/hashicorp/go-memdb" "github.com/sirupsen/logrus" ) diff --git a/daemon/cluster/controllers/plugin/controller.go b/daemon/cluster/controllers/plugin/controller.go index f10747e39a..1f4a80aaa5 100644 --- a/daemon/cluster/controllers/plugin/controller.go +++ b/daemon/cluster/controllers/plugin/controller.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/swarm/runtime" "github.com/docker/docker/errdefs" "github.com/docker/docker/plugin" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" "github.com/docker/swarmkit/api" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" diff --git a/daemon/cluster/controllers/plugin/controller_test.go b/daemon/cluster/controllers/plugin/controller_test.go index 8329d44766..0611d59d9c 100644 --- a/daemon/cluster/controllers/plugin/controller_test.go +++ b/daemon/cluster/controllers/plugin/controller_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/api/types/swarm/runtime" "github.com/docker/docker/pkg/pubsub" "github.com/docker/docker/plugin" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" "github.com/sirupsen/logrus" ) diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index 720b8447fc..664740f06e 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/time/rate" diff --git a/daemon/config/config_unix.go b/daemon/config/config_unix.go index ff8f78d3bf..92076d4d7f 100644 --- a/daemon/config/config_unix.go +++ b/daemon/config/config_unix.go @@ -7,7 +7,7 @@ import ( containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/opts" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) const ( diff --git a/daemon/config/config_unix_test.go b/daemon/config/config_unix_test.go index 529b677705..3824918f5e 100644 --- a/daemon/config/config_unix_test.go +++ b/daemon/config/config_unix_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/docker/docker/opts" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/spf13/pflag" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/daemon/events/metrics.go b/daemon/events/metrics.go index 199858d6e0..bf939004bf 100644 --- a/daemon/events/metrics.go +++ b/daemon/events/metrics.go @@ -1,6 +1,6 @@ package events // import "github.com/docker/docker/daemon/events" -import "github.com/docker/go-metrics" +import metrics "github.com/docker/go-metrics" var ( eventsCounter metrics.Counter diff --git a/daemon/exec.go b/daemon/exec.go index 5fdba72a09..d477a36720 100644 --- a/daemon/exec.go +++ b/daemon/exec.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/term" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/exec_linux.go b/daemon/exec_linux.go index f712dd31df..2df28cb3b8 100644 --- a/daemon/exec_linux.go +++ b/daemon/exec_linux.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/daemon/exec" "github.com/docker/docker/oci/caps" "github.com/opencontainers/runc/libcontainer/apparmor" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) func (daemon *Daemon) execSetPlatformOpt(c *container.Container, ec *exec.Config, p *specs.Process) error { diff --git a/daemon/exec_linux_test.go b/daemon/exec_linux_test.go index 0db7f080db..9e2f829eb7 100644 --- a/daemon/exec_linux_test.go +++ b/daemon/exec_linux_test.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/daemon/exec" "github.com/opencontainers/runc/libcontainer/apparmor" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "gotest.tools/assert" ) diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go index fcaedc6eab..a20875eb91 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -32,7 +32,7 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/system" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 30bbfd8533..5ab70503b1 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -27,7 +27,7 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers/kernel" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go index a42a03ba90..400cfe05fb 100644 --- a/daemon/graphdriver/devmapper/driver.go +++ b/daemon/graphdriver/devmapper/driver.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/locker" "github.com/docker/docker/pkg/mount" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go index e83d0bb2ad..348fc8692d 100644 --- a/daemon/graphdriver/graphtest/graphtest_unix.go +++ b/daemon/graphdriver/graphtest/graphtest_unix.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver/quota" "github.com/docker/docker/pkg/stringid" - "github.com/docker/go-units" + units "github.com/docker/go-units" "golang.org/x/sys/unix" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index eedf5b73ae..71bb4e6295 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -31,7 +31,7 @@ import ( "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/system" - "github.com/docker/go-units" + units "github.com/docker/go-units" rsystem "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/daemon/graphdriver/plugin.go b/daemon/graphdriver/plugin.go index b0983c5667..00f1dc9b6d 100644 --- a/daemon/graphdriver/plugin.go +++ b/daemon/graphdriver/plugin.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" "github.com/pkg/errors" ) diff --git a/daemon/graphdriver/vfs/driver.go b/daemon/graphdriver/vfs/driver.go index d7f14ecb62..98824bb07e 100644 --- a/daemon/graphdriver/vfs/driver.go +++ b/daemon/graphdriver/vfs/driver.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/system" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" ) diff --git a/daemon/graphdriver/windows/windows.go b/daemon/graphdriver/windows/windows.go index 9b83e7975b..66d5af5bbb 100644 --- a/daemon/graphdriver/windows/windows.go +++ b/daemon/graphdriver/windows/windows.go @@ -19,7 +19,7 @@ import ( "time" "unsafe" - "github.com/Microsoft/go-winio" + winio "github.com/Microsoft/go-winio" "github.com/Microsoft/go-winio/archive/tar" "github.com/Microsoft/go-winio/backuptar" "github.com/Microsoft/go-winio/vhd" diff --git a/daemon/images/image_prune.go b/daemon/images/image_prune.go index 313494f2f4..aa8019b9a4 100644 --- a/daemon/images/image_prune.go +++ b/daemon/images/image_prune.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/docker/docker/layer" - "github.com/opencontainers/go-digest" + 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 f2b6894861..4eedfdddc1 100644 --- a/daemon/images/image_pull.go +++ b/daemon/images/image_pull.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/registry" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/daemon/images/locals.go b/daemon/images/locals.go index 5ffc460a09..a57ea2da60 100644 --- a/daemon/images/locals.go +++ b/daemon/images/locals.go @@ -3,7 +3,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( "fmt" - "github.com/docker/go-metrics" + metrics "github.com/docker/go-metrics" ) type invalidFilter struct { diff --git a/daemon/images/service.go b/daemon/images/service.go index e8df5cb649..56bfc441ce 100644 --- a/daemon/images/service.go +++ b/daemon/images/service.go @@ -15,7 +15,7 @@ import ( dockerreference "github.com/docker/docker/reference" "github.com/docker/docker/registry" "github.com/docker/libtrust" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/info.go b/daemon/info.go index bfd8199edb..7f92db12a2 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/pkg/system" "github.com/docker/docker/registry" "github.com/docker/go-connections/sockets" - "github.com/docker/go-metrics" + metrics "github.com/docker/go-metrics" "github.com/sirupsen/logrus" ) diff --git a/daemon/list_test.go b/daemon/list_test.go index c0a7290cd4..4a8d4cc0b2 100644 --- a/daemon/list_test.go +++ b/daemon/list_test.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/image" "github.com/google/uuid" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/daemon/listeners/listeners_windows.go b/daemon/listeners/listeners_windows.go index 73f5f79e4b..b6d630445a 100644 --- a/daemon/listeners/listeners_windows.go +++ b/daemon/listeners/listeners_windows.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/Microsoft/go-winio" + winio "github.com/Microsoft/go-winio" "github.com/docker/go-connections/sockets" ) diff --git a/daemon/logger/factory.go b/daemon/logger/factory.go index 84b54b2794..9723f7fc0c 100644 --- a/daemon/logger/factory.go +++ b/daemon/logger/factory.go @@ -7,7 +7,7 @@ import ( containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/pkg/errors" ) diff --git a/daemon/logger/fluentd/fluentd.go b/daemon/logger/fluentd/fluentd.go index 2ed91df19f..cfa0ce5dc2 100644 --- a/daemon/logger/fluentd/fluentd.go +++ b/daemon/logger/fluentd/fluentd.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/pkg/urlutil" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/fluent/fluent-logger-golang/fluent" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/daemon/logger/jsonfilelog/jsonfilelog.go b/daemon/logger/jsonfilelog/jsonfilelog.go index e59f3bf6a5..e66a6b8266 100644 --- a/daemon/logger/jsonfilelog/jsonfilelog.go +++ b/daemon/logger/jsonfilelog/jsonfilelog.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" "github.com/docker/docker/daemon/logger/loggerutils" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/logger/local/local.go b/daemon/logger/local/local.go index ba4aa096f7..f8c58c6fca 100644 --- a/daemon/logger/local/local.go +++ b/daemon/logger/local/local.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/errdefs" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/daemon/logger/metrics.go b/daemon/logger/metrics.go index b7dfd38ec2..05b557f862 100644 --- a/daemon/logger/metrics.go +++ b/daemon/logger/metrics.go @@ -1,7 +1,7 @@ package logger // import "github.com/docker/docker/daemon/logger" import ( - "github.com/docker/go-metrics" + metrics "github.com/docker/go-metrics" ) var ( diff --git a/daemon/metrics.go b/daemon/metrics.go index f2548b6dfa..c693b82709 100644 --- a/daemon/metrics.go +++ b/daemon/metrics.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" - "github.com/docker/go-metrics" + metrics "github.com/docker/go-metrics" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" diff --git a/daemon/metrics_unix.go b/daemon/metrics_unix.go index a9b5f810b0..b131ebc3e1 100644 --- a/daemon/metrics_unix.go +++ b/daemon/metrics_unix.go @@ -10,8 +10,8 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/plugin" - "github.com/docker/go-metrics" - "github.com/opencontainers/runtime-spec/specs-go" + metrics "github.com/docker/go-metrics" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/daemon/nvidia_linux.go b/daemon/nvidia_linux.go index c136634e6a..9f1c914146 100644 --- a/daemon/nvidia_linux.go +++ b/daemon/nvidia_linux.go @@ -8,7 +8,7 @@ import ( "github.com/containerd/containerd/contrib/nvidia" "github.com/docker/docker/pkg/capabilities" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 6f55a19c16..a3864b9a83 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -27,7 +27,7 @@ import ( "github.com/opencontainers/runc/libcontainer/devices" rsystem "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/runc/libcontainer/user" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/daemon/oci_utils.go b/daemon/oci_utils.go index 6058d86e48..2d833502bd 100644 --- a/daemon/oci_utils.go +++ b/daemon/oci_utils.go @@ -2,7 +2,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( "github.com/docker/docker/container" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) func setLinuxDomainname(c *container.Container, s *specs.Spec) { diff --git a/daemon/oci_windows.go b/daemon/oci_windows.go index 1d3b78a4dd..d5c1ab1c1d 100644 --- a/daemon/oci_windows.go +++ b/daemon/oci_windows.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/oci/caps" "github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/system" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sys/windows/registry" diff --git a/daemon/oci_windows_test.go b/daemon/oci_windows_test.go index 370187afcb..c757536b40 100644 --- a/daemon/oci_windows_test.go +++ b/daemon/oci_windows_test.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/container" swarmagent "github.com/docker/swarmkit/agent" swarmapi "github.com/docker/swarmkit/api" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows/registry" "gotest.tools/assert" ) diff --git a/daemon/seccomp_linux.go b/daemon/seccomp_linux.go index 4559bc29e2..eea1913189 100644 --- a/daemon/seccomp_linux.go +++ b/daemon/seccomp_linux.go @@ -10,7 +10,7 @@ import ( coci "github.com/containerd/containerd/oci" "github.com/docker/docker/container" "github.com/docker/docker/profiles/seccomp" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/daemon/selinux_linux.go b/daemon/selinux_linux.go index f87b30b738..1f7843ed1e 100644 --- a/daemon/selinux_linux.go +++ b/daemon/selinux_linux.go @@ -1,6 +1,6 @@ package daemon // import "github.com/docker/docker/daemon" -import "github.com/opencontainers/selinux/go-selinux" +import selinux "github.com/opencontainers/selinux/go-selinux" func selinuxSetDisabled() { selinux.SetDisabled() diff --git a/daemon/top_windows.go b/daemon/top_windows.go index 23cb4d48bd..010b426d3f 100644 --- a/daemon/top_windows.go +++ b/daemon/top_windows.go @@ -7,7 +7,7 @@ import ( "time" containertypes "github.com/docker/docker/api/types/container" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) // ContainerTop handles `docker top` client requests. diff --git a/daemon/update_linux.go b/daemon/update_linux.go index 7dc1f33156..c1d3684868 100644 --- a/daemon/update_linux.go +++ b/daemon/update_linux.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/api/types/container" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) func toContainerdResources(resources container.Resources) *libcontainerdtypes.Resources { diff --git a/distribution/config.go b/distribution/config.go index 438051c296..8e66d93cad 100644 --- a/distribution/config.go +++ b/distribution/config.go @@ -19,7 +19,7 @@ import ( refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" "github.com/docker/libtrust" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/distribution/errors.go b/distribution/errors.go index 9dc5955f26..194287d8a2 100644 --- a/distribution/errors.go +++ b/distribution/errors.go @@ -9,7 +9,7 @@ import ( "github.com/docker/distribution" "github.com/docker/distribution/reference" "github.com/docker/distribution/registry/api/errcode" - "github.com/docker/distribution/registry/api/v2" + v2 "github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/registry/client" "github.com/docker/distribution/registry/client/auth" "github.com/docker/docker/distribution/xfer" diff --git a/distribution/errors_test.go b/distribution/errors_test.go index 7105bdb4d6..87354bc22e 100644 --- a/distribution/errors_test.go +++ b/distribution/errors_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/docker/distribution/registry/api/errcode" - "github.com/docker/distribution/registry/api/v2" + v2 "github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/registry/client" ) diff --git a/distribution/metadata/v1_id_service.go b/distribution/metadata/v1_id_service.go index 5575c59b0e..86c83f62eb 100644 --- a/distribution/metadata/v1_id_service.go +++ b/distribution/metadata/v1_id_service.go @@ -1,7 +1,7 @@ package metadata // import "github.com/docker/docker/distribution/metadata" import ( - "github.com/docker/docker/image/v1" + v1 "github.com/docker/docker/image/v1" "github.com/docker/docker/layer" "github.com/pkg/errors" ) diff --git a/distribution/metadata/v2_metadata_service.go b/distribution/metadata/v2_metadata_service.go index fe33498554..482d2224ea 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" - "github.com/opencontainers/go-digest" + 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 cf24e0d85b..c5f0a562ae 100644 --- a/distribution/metadata/v2_metadata_service_test.go +++ b/distribution/metadata/v2_metadata_service_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/docker/docker/layer" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) func TestV2MetadataService(t *testing.T) { diff --git a/distribution/pull.go b/distribution/pull.go index be366ce4a9..ecf2f98168 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" - "github.com/opencontainers/go-digest" + 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.go b/distribution/pull_v2.go index 77c5f645a0..9efe477cc0 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -31,7 +31,7 @@ import ( "github.com/docker/docker/pkg/system" refstore "github.com/docker/docker/reference" "github.com/docker/docker/registry" - "github.com/opencontainers/go-digest" + 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 7c14d50026..5a3bf26d29 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/distribution/push_v2.go b/distribution/push_v2.go index 06863ad0d7..0bf39e2217 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) diff --git a/distribution/push_v2_test.go b/distribution/push_v2_test.go index 436b4a1797..9bf3675ece 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" - "github.com/opencontainers/go-digest" + 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 4ab3705af6..50b400bd1e 100644 --- a/distribution/xfer/download_test.go +++ b/distribution/xfer/download_test.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) const maxDownloadConcurrency = 3 diff --git a/image/fs.go b/image/fs.go index 7080c8c015..8300c41884 100644 --- a/image/fs.go +++ b/image/fs.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/docker/docker/pkg/ioutils" - "github.com/opencontainers/go-digest" + 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 6290c2b66e..e4573954b8 100644 --- a/image/fs_test.go +++ b/image/fs_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/image/image.go b/image/image.go index 079ecb8131..568b23fe7b 100644 --- a/image/image.go +++ b/image/image.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/dockerversion" "github.com/docker/docker/layer" - "github.com/opencontainers/go-digest" + 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 1a8a8a2451..0ad87f5c61 100644 --- a/image/store.go +++ b/image/store.go @@ -9,7 +9,7 @@ import ( "github.com/docker/distribution/digestset" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/system" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/image/store_test.go b/image/store_test.go index 0edf3282af..3f65f52c23 100644 --- a/image/store_test.go +++ b/image/store_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/docker/docker/layer" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" "gotest.tools/assert/cmp" ) diff --git a/image/tarexport/load.go b/image/tarexport/load.go index 786214383e..cc22127038 100644 --- a/image/tarexport/load.go +++ b/image/tarexport/load.go @@ -15,7 +15,7 @@ import ( "github.com/docker/distribution" "github.com/docker/distribution/reference" "github.com/docker/docker/image" - "github.com/docker/docker/image/v1" + v1 "github.com/docker/docker/image/v1" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/chrootarchive" @@ -24,7 +24,7 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/system" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) diff --git a/image/tarexport/save.go b/image/tarexport/save.go index 4e734b3503..0fb5986b72 100644 --- a/image/tarexport/save.go +++ b/image/tarexport/save.go @@ -14,11 +14,11 @@ import ( "github.com/docker/distribution" "github.com/docker/distribution/reference" "github.com/docker/docker/image" - "github.com/docker/docker/image/v1" + v1 "github.com/docker/docker/image/v1" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/system" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/image/v1/imagev1.go b/image/v1/imagev1.go index c341ceaa77..1eec8dfc8c 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" - "github.com/opencontainers/go-digest" + 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 2f57f6e242..29fc9b94a0 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -26,7 +26,7 @@ import ( "github.com/docker/docker/testutil/fakegit" "github.com/docker/docker/testutil/fakestorage" "github.com/moby/buildkit/frontend/dockerfile/command" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index 2d56e2ac94..e0a9cc4138 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -19,7 +19,7 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/testutil/fakecontext" - "github.com/docker/go-units" + units "github.com/docker/go-units" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index 494ac50204..1d81feebf2 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 5182f91fc7..933eaed738 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -34,7 +34,7 @@ import ( "github.com/docker/docker/opts" "github.com/docker/docker/pkg/mount" testdaemon "github.com/docker/docker/testutil/daemon" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/docker/libnetwork/iptables" "github.com/docker/libtrust" "golang.org/x/sys/unix" diff --git a/integration-cli/docker_cli_pull_local_test.go b/integration-cli/docker_cli_pull_local_test.go index 94df86d4c9..eab316ac79 100644 --- a/integration-cli/docker_cli_pull_local_test.go +++ b/integration-cli/docker_cli_pull_local_test.go @@ -15,7 +15,7 @@ import ( "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/integration-cli/cli/build" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" "gotest.tools/icmd" ) diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index 81f5b1fb87..871be9563d 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 4bcd1d0831..70549525ef 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -17,7 +17,7 @@ import ( "time" "github.com/docker/docker/integration-cli/cli/build" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/icmd" diff --git a/layer/empty_test.go b/layer/empty_test.go index ec9fbc1a3c..d4671a1b07 100644 --- a/layer/empty_test.go +++ b/layer/empty_test.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) func TestEmptyLayer(t *testing.T) { diff --git a/layer/filestore_test.go b/layer/filestore_test.go index 878dc54e36..3af1904f48 100644 --- a/layer/filestore_test.go +++ b/layer/filestore_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/docker/docker/pkg/stringid" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) func randomLayerID(seed int64) ChainID { diff --git a/layer/layer.go b/layer/layer.go index 53923ad42a..7b7624f4fc 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) diff --git a/layer/layer_store.go b/layer/layer_store.go index 7b8c011f4c..dd766c9d55 100644 --- a/layer/layer_store.go +++ b/layer/layer_store.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" - "github.com/opencontainers/go-digest" + 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 5c4e8fab19..aedff35b05 100644 --- a/layer/layer_test.go +++ b/layer/layer_test.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/stringid" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) func init() { diff --git a/layer/migration.go b/layer/migration.go index 12500694f0..5834659433 100644 --- a/layer/migration.go +++ b/layer/migration.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/opencontainers/go-digest" + 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 3555e8b027..15841d5bd2 100644 --- a/layer/ro_layer.go +++ b/layer/ro_layer.go @@ -5,7 +5,7 @@ import ( "io" "github.com/docker/distribution" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) type roLayer struct { diff --git a/libcontainerd/remote/client_linux.go b/libcontainerd/remote/client_linux.go index 1c43ef61c3..2389cbb69d 100644 --- a/libcontainerd/remote/client_linux.go +++ b/libcontainerd/remote/client_linux.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/containerd/containers" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/pkg/idtools" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/libcontainerd/types/types.go b/libcontainerd/types/types.go index 42d5f24476..de9a385895 100644 --- a/libcontainerd/types/types.go +++ b/libcontainerd/types/types.go @@ -6,7 +6,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // EventType represents a possible event from libcontainerd diff --git a/libcontainerd/types/types_linux.go b/libcontainerd/types/types_linux.go index 0a2daf5777..2e10743114 100644 --- a/libcontainerd/types/types_linux.go +++ b/libcontainerd/types/types_linux.go @@ -4,7 +4,7 @@ import ( "time" "github.com/containerd/cgroups" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // Summary is not used on linux diff --git a/oci/defaults.go b/oci/defaults.go index 35fbcd1d87..c55d1aac02 100644 --- a/oci/defaults.go +++ b/oci/defaults.go @@ -4,7 +4,7 @@ import ( "os" "runtime" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) func iPtr(i int64) *int64 { return &i } diff --git a/oci/devices_linux.go b/oci/devices_linux.go index 46d4e1d32d..7f1658e53c 100644 --- a/oci/devices_linux.go +++ b/oci/devices_linux.go @@ -8,7 +8,7 @@ import ( "github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/devices" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // Device transforms a libcontainer configs.Device to a specs.LinuxDevice object. diff --git a/oci/namespaces.go b/oci/namespaces.go index 5a2d8f2087..f32e489b4a 100644 --- a/oci/namespaces.go +++ b/oci/namespaces.go @@ -1,6 +1,6 @@ package oci // import "github.com/docker/docker/oci" -import "github.com/opencontainers/runtime-spec/specs-go" +import specs "github.com/opencontainers/runtime-spec/specs-go" // RemoveNamespace removes the `nsType` namespace from OCI spec `s` func RemoveNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) { diff --git a/opts/opts.go b/opts/opts.go index de8aacb806..c3bf5cd7c1 100644 --- a/opts/opts.go +++ b/opts/opts.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) var ( diff --git a/opts/ulimit.go b/opts/ulimit.go index 0e2a36236c..61cc58d4d3 100644 --- a/opts/ulimit.go +++ b/opts/ulimit.go @@ -3,7 +3,7 @@ package opts // import "github.com/docker/docker/opts" import ( "fmt" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) // UlimitOpt defines a map of Ulimits diff --git a/opts/ulimit_test.go b/opts/ulimit_test.go index 41e12627c8..77f87cc6a8 100644 --- a/opts/ulimit_test.go +++ b/opts/ulimit_test.go @@ -3,7 +3,7 @@ package opts // import "github.com/docker/docker/opts" import ( "testing" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) func TestUlimitOpt(t *testing.T) { diff --git a/pkg/jsonmessage/jsonmessage.go b/pkg/jsonmessage/jsonmessage.go index a68b566cea..6d66408984 100644 --- a/pkg/jsonmessage/jsonmessage.go +++ b/pkg/jsonmessage/jsonmessage.go @@ -8,7 +8,7 @@ import ( "time" "github.com/docker/docker/pkg/term" - "github.com/docker/go-units" + units "github.com/docker/go-units" "github.com/morikuni/aec" ) diff --git a/pkg/parsers/kernel/kernel_darwin.go b/pkg/parsers/kernel/kernel_darwin.go index 6e599eebcc..6a302dcee2 100644 --- a/pkg/parsers/kernel/kernel_darwin.go +++ b/pkg/parsers/kernel/kernel_darwin.go @@ -9,7 +9,7 @@ import ( "os/exec" "strings" - "github.com/mattn/go-shellwords" + shellwords "github.com/mattn/go-shellwords" ) // GetKernelVersion gets the current kernel version. diff --git a/pkg/parsers/operatingsystem/operatingsystem_linux.go b/pkg/parsers/operatingsystem/operatingsystem_linux.go index 8943c1ae31..18dc39472c 100644 --- a/pkg/parsers/operatingsystem/operatingsystem_linux.go +++ b/pkg/parsers/operatingsystem/operatingsystem_linux.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/mattn/go-shellwords" + shellwords "github.com/mattn/go-shellwords" ) var ( diff --git a/pkg/system/meminfo_linux.go b/pkg/system/meminfo_linux.go index 09a9d79f17..cd060eff24 100644 --- a/pkg/system/meminfo_linux.go +++ b/pkg/system/meminfo_linux.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) // ReadMemInfo retrieves memory statistics of the host system and returns a diff --git a/pkg/system/meminfo_unix_test.go b/pkg/system/meminfo_unix_test.go index 73f4e4d2cd..e650cfa627 100644 --- a/pkg/system/meminfo_unix_test.go +++ b/pkg/system/meminfo_unix_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/go-units" + units "github.com/docker/go-units" ) // TestMemInfo tests parseMemInfo with a static meminfo string diff --git a/pkg/term/term_windows.go b/pkg/term/term_windows.go index a3c3db1315..6e83b59e90 100644 --- a/pkg/term/term_windows.go +++ b/pkg/term/term_windows.go @@ -7,7 +7,7 @@ import ( "syscall" // used for STD_INPUT_HANDLE, STD_OUTPUT_HANDLE and STD_ERROR_HANDLE "github.com/Azure/go-ansiterm/winterm" - "github.com/docker/docker/pkg/term/windows" + windowsconsole "github.com/docker/docker/pkg/term/windows" ) // State holds the console mode for the terminal. diff --git a/pkg/term/windows/windows.go b/pkg/term/windows/windows.go index 3e5593ca6a..1f8965969c 100644 --- a/pkg/term/windows/windows.go +++ b/pkg/term/windows/windows.go @@ -9,7 +9,7 @@ import ( "os" "sync" - "github.com/Azure/go-ansiterm" + ansiterm "github.com/Azure/go-ansiterm" "github.com/sirupsen/logrus" ) diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go index 044e14b0cb..3201527d44 100644 --- a/plugin/backend_linux.go +++ b/plugin/backend_linux.go @@ -31,9 +31,9 @@ import ( "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/system" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" refstore "github.com/docker/docker/reference" - "github.com/opencontainers/go-digest" + 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/blobstore.go b/plugin/blobstore.go index a24e7bdf4f..0babefbbf5 100644 --- a/plugin/blobstore.go +++ b/plugin/blobstore.go @@ -15,7 +15,7 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/chrootarchive" "github.com/docker/docker/pkg/progress" - "github.com/opencontainers/go-digest" + 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/defs.go b/plugin/defs.go index d793f6f5aa..9a3577a72b 100644 --- a/plugin/defs.go +++ b/plugin/defs.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/docker/docker/pkg/plugins" - "github.com/docker/docker/plugin/v2" - "github.com/opencontainers/runtime-spec/specs-go" + v2 "github.com/docker/docker/plugin/v2" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // Store manages the plugin inventory in memory and on-disk diff --git a/plugin/executor/containerd/containerd.go b/plugin/executor/containerd/containerd.go index 85a159f1ac..91bae6c6b9 100644 --- a/plugin/executor/containerd/containerd.go +++ b/plugin/executor/containerd/containerd.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/plugin/manager.go b/plugin/manager.go index c6f896129b..aac5a4666e 100644 --- a/plugin/manager.go +++ b/plugin/manager.go @@ -21,10 +21,10 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/pubsub" "github.com/docker/docker/pkg/system" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" "github.com/docker/docker/registry" - "github.com/opencontainers/go-digest" - "github.com/opencontainers/runtime-spec/specs-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 23fa462865..bb8e96bcf7 100644 --- a/plugin/manager_linux.go +++ b/plugin/manager_linux.go @@ -15,8 +15,8 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/stringid" - "github.com/docker/docker/plugin/v2" - "github.com/opencontainers/go-digest" + v2 "github.com/docker/docker/plugin/v2" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/plugin/manager_linux_test.go b/plugin/manager_linux_test.go index 1b6a3bf773..c75efb7b72 100644 --- a/plugin/manager_linux_test.go +++ b/plugin/manager_linux_test.go @@ -12,8 +12,8 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/system" - "github.com/docker/docker/plugin/v2" - "github.com/opencontainers/runtime-spec/specs-go" + v2 "github.com/docker/docker/plugin/v2" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "gotest.tools/skip" ) diff --git a/plugin/manager_windows.go b/plugin/manager_windows.go index 90cc52c992..89595dfd84 100644 --- a/plugin/manager_windows.go +++ b/plugin/manager_windows.go @@ -3,7 +3,7 @@ package plugin // import "github.com/docker/docker/plugin" import ( "fmt" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/plugin/store.go b/plugin/store.go index 8e96c11da4..e88861e5b3 100644 --- a/plugin/store.go +++ b/plugin/store.go @@ -8,8 +8,8 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" - "github.com/docker/docker/plugin/v2" - "github.com/opencontainers/runtime-spec/specs-go" + v2 "github.com/docker/docker/plugin/v2" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/plugin/store_test.go b/plugin/store_test.go index 14b484f76c..47b4bd7d4d 100644 --- a/plugin/store_test.go +++ b/plugin/store_test.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/plugingetter" - "github.com/docker/docker/plugin/v2" + v2 "github.com/docker/docker/plugin/v2" ) func TestFilterByCapNeg(t *testing.T) { diff --git a/plugin/v2/plugin.go b/plugin/v2/plugin.go index 6852511c5e..b46ff60b31 100644 --- a/plugin/v2/plugin.go +++ b/plugin/v2/plugin.go @@ -11,8 +11,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" - "github.com/opencontainers/go-digest" - "github.com/opencontainers/runtime-spec/specs-go" + digest "github.com/opencontainers/go-digest" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // Plugin represents an individual plugin. diff --git a/plugin/v2/plugin_linux.go b/plugin/v2/plugin_linux.go index 58c432fcd6..4ad582cd83 100644 --- a/plugin/v2/plugin_linux.go +++ b/plugin/v2/plugin_linux.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/oci" "github.com/docker/docker/pkg/system" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/plugin/v2/plugin_unsupported.go b/plugin/v2/plugin_unsupported.go index 5242fe124c..734b2ac664 100644 --- a/plugin/v2/plugin_unsupported.go +++ b/plugin/v2/plugin_unsupported.go @@ -5,7 +5,7 @@ package v2 // import "github.com/docker/docker/plugin/v2" import ( "errors" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // InitSpec creates an OCI spec from the plugin's config. diff --git a/reference/store.go b/reference/store.go index b942c42ca2..d6ef6697f5 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" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/reference/store_test.go b/reference/store_test.go index 921cd37ae5..28c49d83d1 100644 --- a/reference/store_test.go +++ b/reference/store_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/docker/distribution/reference" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/registry/session.go b/registry/session.go index ef14299594..59f5ad50ff 100644 --- a/registry/session.go +++ b/registry/session.go @@ -3,6 +3,7 @@ package registry // import "github.com/docker/docker/registry" import ( "bytes" "crypto/sha256" + // this is required for some certificates _ "crypto/sha512" "encoding/hex" diff --git a/rootless/specconv/specconv_linux.go b/rootless/specconv/specconv_linux.go index 77c9ce28b3..f02e94c293 100644 --- a/rootless/specconv/specconv_linux.go +++ b/rootless/specconv/specconv_linux.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strconv" - "github.com/opencontainers/runtime-spec/specs-go" + specs "github.com/opencontainers/runtime-spec/specs-go" ) // ToRootless converts spec to be compatible with "rootless" runc. diff --git a/testutil/registry/registry.go b/testutil/registry/registry.go index 59af456a70..8052382ed0 100644 --- a/testutil/registry/registry.go +++ b/testutil/registry/registry.go @@ -10,7 +10,7 @@ import ( "time" "github.com/docker/docker/testutil" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" "gotest.tools/assert" ) diff --git a/testutil/request/npipe_windows.go b/testutil/request/npipe_windows.go index a268aac922..9741ae64c6 100644 --- a/testutil/request/npipe_windows.go +++ b/testutil/request/npipe_windows.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/Microsoft/go-winio" + winio "github.com/Microsoft/go-winio" ) func npipeDial(path string, timeout time.Duration) (net.Conn, error) {