use consistent aliases and re-group imports

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

container/docker/factory.go

@@ -25,9 +25,12 @@ import (
 
 	"github.com/blang/semver/v4"
 	dockersystem "github.com/docker/docker/api/types/system"
-	"github.com/google/cadvisor/container/containerd"
+	dclient "github.com/docker/docker/client"
+	"golang.org/x/net/context"
+	"k8s.io/klog/v2"
 
 	"github.com/google/cadvisor/container"
+	"github.com/google/cadvisor/container/containerd"
 	dockerutil "github.com/google/cadvisor/container/docker/utils"
 	"github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/devicemapper"
@@ -36,10 +39,6 @@ import (
 	"github.com/google/cadvisor/machine"
 	"github.com/google/cadvisor/watcher"
 	"github.com/google/cadvisor/zfs"
-
-	docker "github.com/docker/docker/client"
-	"golang.org/x/net/context"
-	"k8s.io/klog/v2"
 )
 
 var ArgDockerEndpoint = flag.String("docker", "unix:///var/run/docker.sock", "docker endpoint")
@@ -110,7 +109,7 @@ type dockerFactory struct {
 	storageDriver StorageDriver
 	storageDir    string
 
-	client           *docker.Client
+	client           *dclient.Client
 	containerdClient containerd.ContainerdClient
 
 	// Information about the mounted cgroup subsystems.

container/docker/handler.go

@@ -24,6 +24,11 @@ import (
 	"strings"
 	"time"
 
+	dclient "github.com/docker/docker/client"
+	"github.com/opencontainers/cgroups"
+	"github.com/opencontainers/runtime-spec/specs-go"
+	"golang.org/x/net/context"
+
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/common"
 	"github.com/google/cadvisor/container/containerd"
@@ -34,11 +39,6 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/zfs"
-	"github.com/opencontainers/cgroups"
-	"github.com/opencontainers/runtime-spec/specs-go"
-
-	docker "github.com/docker/docker/client"
-	"golang.org/x/net/context"
 )
 
 const (
@@ -118,7 +118,7 @@ func getRwLayerID(containerID, storageDir string, sd StorageDriver, dockerVersio
 
 // newDockerContainerHandler returns a new container.ContainerHandler
 func newDockerContainerHandler(
-	client *docker.Client,
+	client *dclient.Client,
 	containerdClient containerd.ContainerdClient,
 	name string,
 	machineInfoFactory info.MachineInfoFactory,