diff --git a/api/types/container/hostconfig.go b/api/types/container/hostconfig.go index 03648fb7b5..83198305e7 100644 --- a/api/types/container/hostconfig.go +++ b/api/types/container/hostconfig.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/strslice" "github.com/docker/go-connections/nat" - units "github.com/docker/go-units" + "github.com/docker/go-units" ) // CgroupnsMode represents the cgroup namespace mode of the container diff --git a/builder/builder-next/controller.go b/builder/builder-next/controller.go index 2076f75b65..cb6e97cb50 100644 --- a/builder/builder-next/controller.go +++ b/builder/builder-next/controller.go @@ -25,7 +25,7 @@ import ( wlabel "github.com/docker/docker/builder/builder-next/worker/label" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/graphdriver" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache/metadata" "github.com/moby/buildkit/cache/remotecache" diff --git a/container/container.go b/container/container.go index 817016f345..7af1b64910 100644 --- a/container/container.go +++ b/container/container.go @@ -35,7 +35,7 @@ import ( "github.com/docker/docker/restartmanager" "github.com/docker/docker/volume" volumemounts "github.com/docker/docker/volume/mounts" - units "github.com/docker/go-units" + "github.com/docker/go-units" agentexec "github.com/moby/swarmkit/v2/agent/exec" "github.com/moby/sys/signal" "github.com/moby/sys/symlink" diff --git a/container/state.go b/container/state.go index eff5c6fd80..e7b457acec 100644 --- a/container/state.go +++ b/container/state.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/api/types/container" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - units "github.com/docker/go-units" + "github.com/docker/go-units" ) // State holds the current container state, and has methods to get and diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go index 9f895b4bd6..c8808364dc 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -40,7 +40,7 @@ import ( "github.com/docker/docker/internal/containerfs" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/parsers" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/moby/sys/mount" "github.com/moby/sys/userns" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go index ef389fc583..29ea5f7c10 100644 --- a/daemon/graphdriver/graphtest/graphtest_unix.go +++ b/daemon/graphdriver/graphtest/graphtest_unix.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/quota" - units "github.com/docker/go-units" + "github.com/docker/go-units" "golang.org/x/sys/unix" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index cd03acb86f..e88bfbd210 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -28,7 +28,7 @@ import ( "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/quota" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/moby/locker" "github.com/moby/sys/mount" "github.com/moby/sys/userns" diff --git a/daemon/graphdriver/vfs/driver.go b/daemon/graphdriver/vfs/driver.go index 30ae3e0d39..12c5329e93 100644 --- a/daemon/graphdriver/vfs/driver.go +++ b/daemon/graphdriver/vfs/driver.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/quota" - units "github.com/docker/go-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 8b85bad204..5cc49b506b 100644 --- a/daemon/graphdriver/windows/windows.go +++ b/daemon/graphdriver/windows/windows.go @@ -33,7 +33,7 @@ import ( "github.com/docker/docker/pkg/longpath" "github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/system" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/pkg/errors" "golang.org/x/sys/windows" ) diff --git a/daemon/logger/factory.go b/daemon/logger/factory.go index 933ea0884e..54f9653963 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" - units "github.com/docker/go-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 ab0a657ddf..0457551cce 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/errdefs" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/fluent/fluent-logger-golang/fluent" "github.com/pkg/errors" ) diff --git a/daemon/logger/jsonfilelog/jsonfilelog.go b/daemon/logger/jsonfilelog/jsonfilelog.go index e3e2490a29..68057f647a 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" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/pkg/errors" ) diff --git a/daemon/logger/local/local.go b/daemon/logger/local/local.go index 252d79500d..88b4f0da28 100644 --- a/daemon/logger/local/local.go +++ b/daemon/logger/local/local.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/errdefs" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/pkg/errors" ) diff --git a/daemon/logger/loggerutils/cache/local_cache.go b/daemon/logger/loggerutils/cache/local_cache.go index 3466c1e79f..8688740713 100644 --- a/daemon/logger/loggerutils/cache/local_cache.go +++ b/daemon/logger/loggerutils/cache/local_cache.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/local" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/pkg/errors" ) diff --git a/daemon/top_windows.go b/daemon/top_windows.go index c99adf45d3..4e87cbfc9a 100644 --- a/daemon/top_windows.go +++ b/daemon/top_windows.go @@ -8,7 +8,7 @@ import ( containertypes "github.com/docker/docker/api/types/container" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - units "github.com/docker/go-units" + "github.com/docker/go-units" ) // ContainerTop handles `docker top` client requests. diff --git a/opts/opts.go b/opts/opts.go index 40b19c4bd9..63949e97e3 100644 --- a/opts/opts.go +++ b/opts/opts.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - units "github.com/docker/go-units" + "github.com/docker/go-units" ) var ( diff --git a/opts/ulimit.go b/opts/ulimit.go index 9b4fbef9fb..2d7c5f0d6a 100644 --- a/opts/ulimit.go +++ b/opts/ulimit.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/docker/docker/api/types/container" - units "github.com/docker/go-units" + "github.com/docker/go-units" ) // UlimitOpt defines a map of Ulimits diff --git a/pkg/jsonmessage/jsonmessage.go b/pkg/jsonmessage/jsonmessage.go index 8d2c8857fb..037327b908 100644 --- a/pkg/jsonmessage/jsonmessage.go +++ b/pkg/jsonmessage/jsonmessage.go @@ -7,7 +7,7 @@ import ( "strings" "time" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/moby/term" "github.com/morikuni/aec" ) diff --git a/volume/local/local_unix.go b/volume/local/local_unix.go index d265d6e2f6..7fc8da021e 100644 --- a/volume/local/local_unix.go +++ b/volume/local/local_unix.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/quota" - units "github.com/docker/go-units" + "github.com/docker/go-units" "github.com/moby/sys/mount" "github.com/moby/sys/mountinfo" "github.com/pkg/errors"