1. docker
  2. Commit 07ff4f1de895dd760aec11f55bc6c4ca2175cef1
Browse code

goimports: fix imports

Format the source according to latest goimports.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/08/05 23:37:47
Showing 125 changed files
api/server/router/distribution/distribution_routes.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/docker/api/types"
16 16 
 	registrytypes "github.com/docker/docker/api/types/registry"
17 17 
 	"github.com/docker/docker/errdefs"
18 
-	"github.com/opencontainers/image-spec/specs-go/v1"
18 
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
19 19 
 	"github.com/pkg/errors"
20 20 
 )
21 21
api/server/router/system/system.go
History View file @ 07ff4f1
... ... 
@@ -2,7 +2,7 @@ package system // import "github.com/docker/docker/api/server/router/system"
2 2
3 3 
 import (
4 4 
 	"github.com/docker/docker/api/server/router"
5 
-	"github.com/docker/docker/builder/builder-next"
5 
+	buildkit "github.com/docker/docker/builder/builder-next"
6 6 
 	"github.com/docker/docker/builder/fscache"
7 7 
 )
8 8
api/types/container/host_config.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/docker/docker/api/types/mount"
8 8 
 	"github.com/docker/docker/api/types/strslice"
9 9 
 	"github.com/docker/go-connections/nat"
10 
-	"github.com/docker/go-units"
10 
+	units "github.com/docker/go-units"
11 11 
 )
12 12
13 13 
 // CgroupnsMode represents the cgroup namespace mode of the container
api/types/registry/registry.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"net"
6 6
7 
-	"github.com/opencontainers/image-spec/specs-go/v1"
7 
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
8 8 
 )
9 9
10 10 
 // ServiceConfig stores daemon registry services configuration.
builder/builder-next/adapters/containerimage/pull.go
History View file @ 07ff4f1
... ... 
@@ -37,7 +37,7 @@ import (
37 37 
 	"github.com/moby/buildkit/util/progress"
38 38 
 	"github.com/moby/buildkit/util/resolver"
39 39 
 	"github.com/moby/buildkit/util/tracing"
40 
-	"github.com/opencontainers/go-digest"
40 
+	digest "github.com/opencontainers/go-digest"
41 41 
 	"github.com/opencontainers/image-spec/identity"
42 42 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
43 43 
 	"github.com/pkg/errors"
builder/dockerfile/copy_windows.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"path/filepath"
7 7 
 	"strings"
8 8
9 
-	"github.com/Microsoft/go-winio"
9 
+	winio "github.com/Microsoft/go-winio"
10 10 
 	"github.com/docker/docker/pkg/idtools"
11 11 
 	"github.com/docker/docker/pkg/reexec"
12 12 
 	"github.com/docker/docker/pkg/system"
builder/dockerfile/metrics.go
History View file @ 07ff4f1
... ... 
@@ -1,7 +1,7 @@
1 1 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
2 2
3 3 
 import (
4 
-	"github.com/docker/go-metrics"
4 
+	metrics "github.com/docker/go-metrics"
5 5 
 )
6 6
7 7 
 var (
builder/remotecontext/tarsum.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6
7 7 
 	"github.com/docker/docker/pkg/containerfs"
8 8 
 	iradix "github.com/hashicorp/go-immutable-radix"
9 
-	"github.com/opencontainers/go-digest"
9 
+	digest "github.com/opencontainers/go-digest"
10 10 
 	"github.com/pkg/errors"
11 11 
 	"github.com/tonistiigi/fsutil"
12 12 
 )
client/image_build_test.go
History View file @ 07ff4f1
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/docker/docker/api/types"
14 14 
 	"github.com/docker/docker/api/types/container"
15 15 
 	"github.com/docker/docker/errdefs"
16 
-	"github.com/docker/go-units"
16 
+	units "github.com/docker/go-units"
17 17 
 )
18 18
19 19 
 func TestImageBuildError(t *testing.T) {
client/service_create.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/distribution/reference"
10 10 
 	"github.com/docker/docker/api/types"
11 11 
 	"github.com/docker/docker/api/types/swarm"
12 
-	"github.com/opencontainers/go-digest"
12 
+	digest "github.com/opencontainers/go-digest"
13 13 
 	"github.com/pkg/errors"
14 14 
 )
15 15
client/service_create_test.go
History View file @ 07ff4f1
... ... 
@@ -14,8 +14,8 @@ import (
14 14 
 	registrytypes "github.com/docker/docker/api/types/registry"
15 15 
 	"github.com/docker/docker/api/types/swarm"
16 16 
 	"github.com/docker/docker/errdefs"
17 
-	"github.com/opencontainers/go-digest"
18 
-	"github.com/opencontainers/image-spec/specs-go/v1"
17 
+	digest "github.com/opencontainers/go-digest"
18 
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
19 19 
 	"gotest.tools/assert"
20 20 
 	is "gotest.tools/assert/cmp"
21 21 
 )
cmd/dockerd/config_unix.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"github.com/docker/docker/daemon/config"
9 9 
 	"github.com/docker/docker/opts"
10 10 
 	"github.com/docker/docker/rootless"
11 
-	"github.com/docker/go-units"
11 
+	units "github.com/docker/go-units"
12 12 
 	"github.com/pkg/errors"
13 13 
 	"github.com/spf13/pflag"
14 14 
 )
cmd/dockerd/metrics.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"net"
5 5 
 	"net/http"
6 6
7 
-	"github.com/docker/go-metrics"
7 
+	metrics "github.com/docker/go-metrics"
8 8 
 	"github.com/pkg/errors"
9 9 
 	"github.com/sirupsen/logrus"
10 10 
 )
container/container.go
History View file @ 07ff4f1
... ... 
@@ -36,7 +36,7 @@ import (
36 36 
 	"github.com/docker/docker/restartmanager"
37 37 
 	"github.com/docker/docker/volume"
38 38 
 	volumemounts "github.com/docker/docker/volume/mounts"
39 
-	"github.com/docker/go-units"
39 
+	units "github.com/docker/go-units"
40 40 
 	agentexec "github.com/docker/swarmkit/agent/exec"
41 41 
 	"github.com/pkg/errors"
42 42 
 	"github.com/sirupsen/logrus"
container/state.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"time"
9 9
10 10 
 	"github.com/docker/docker/api/types"
11 
-	"github.com/docker/go-units"
11 
+	units "github.com/docker/go-units"
12 12 
 )
13 13
14 14 
 // State holds the current container state, and has methods to get and
container/view.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/docker/api/types"
10 10 
 	"github.com/docker/docker/api/types/network"
11 11 
 	"github.com/docker/go-connections/nat"
12 
-	"github.com/hashicorp/go-memdb"
12 
+	memdb "github.com/hashicorp/go-memdb"
13 13 
 	"github.com/sirupsen/logrus"
14 14 
 )
15 15
daemon/cluster/controllers/plugin/controller.go
History View file @ 07ff4f1
... ... 
@@ -11,7 +11,7 @@ import (
11 11 
 	"github.com/docker/docker/api/types/swarm/runtime"
12 12 
 	"github.com/docker/docker/errdefs"
13 13 
 	"github.com/docker/docker/plugin"
14 
-	"github.com/docker/docker/plugin/v2"
14 
+	v2 "github.com/docker/docker/plugin/v2"
15 15 
 	"github.com/docker/swarmkit/api"
16 16 
 	"github.com/gogo/protobuf/proto"
17 17 
 	"github.com/pkg/errors"
daemon/cluster/controllers/plugin/controller_test.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/docker/api/types/swarm/runtime"
16 16 
 	"github.com/docker/docker/pkg/pubsub"
17 17 
 	"github.com/docker/docker/plugin"
18 
-	"github.com/docker/docker/plugin/v2"
18 
+	v2 "github.com/docker/docker/plugin/v2"
19 19 
 	"github.com/sirupsen/logrus"
20 20 
 )
21 21
daemon/cluster/executor/container/adapter.go
History View file @ 07ff4f1
... ... 
@@ -26,7 +26,7 @@ import (
26 26 
 	"github.com/docker/swarmkit/api"
27 27 
 	"github.com/docker/swarmkit/log"
28 28 
 	gogotypes "github.com/gogo/protobuf/types"
29 
-	"github.com/opencontainers/go-digest"
29 
+	digest "github.com/opencontainers/go-digest"
30 30 
 	"github.com/pkg/errors"
31 31 
 	"github.com/sirupsen/logrus"
32 32 
 	"golang.org/x/time/rate"
daemon/config/config_unix.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7
8 8 
 	containertypes "github.com/docker/docker/api/types/container"
9 9 
 	"github.com/docker/docker/opts"
10 
-	"github.com/docker/go-units"
10 
+	units "github.com/docker/go-units"
11 11 
 )
12 12
13 13 
 const (
daemon/config/config_unix_test.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"testing"
7 7
8 8 
 	"github.com/docker/docker/opts"
9 
-	"github.com/docker/go-units"
9 
+	units "github.com/docker/go-units"
10 10 
 	"github.com/spf13/pflag"
11 11 
 	"gotest.tools/assert"
12 12 
 	is "gotest.tools/assert/cmp"
daemon/events/metrics.go
History View file @ 07ff4f1
... ... 
@@ -1,6 +1,6 @@
1 1 
 package events // import "github.com/docker/docker/daemon/events"
2 2
3 
-import "github.com/docker/go-metrics"
3 
+import metrics "github.com/docker/go-metrics"
4 4
5 5 
 var (
6 6 
 	eventsCounter    metrics.Counter
daemon/exec.go
History View file @ 07ff4f1
... ... 
@@ -17,7 +17,7 @@ import (
17 17 
 	"github.com/docker/docker/pkg/pools"
18 18 
 	"github.com/docker/docker/pkg/signal"
19 19 
 	"github.com/docker/docker/pkg/term"
20 
-	"github.com/opencontainers/runtime-spec/specs-go"
20 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
21 21 
 	"github.com/pkg/errors"
22 22 
 	"github.com/sirupsen/logrus"
23 23 
 )
daemon/exec_linux.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/docker/docker/daemon/exec"
8 8 
 	"github.com/docker/docker/oci/caps"
9 9 
 	"github.com/opencontainers/runc/libcontainer/apparmor"
10 
-	"github.com/opencontainers/runtime-spec/specs-go"
10 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
11 11 
 )
12 12
13 13 
 func (daemon *Daemon) execSetPlatformOpt(c *container.Container, ec *exec.Config, p *specs.Process) error {
daemon/exec_linux_test.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/docker/container"
10 10 
 	"github.com/docker/docker/daemon/exec"
11 11 
 	"github.com/opencontainers/runc/libcontainer/apparmor"
12 
-	"github.com/opencontainers/runtime-spec/specs-go"
12 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
13 13 
 	"gotest.tools/assert"
14 14 
 )
15 15
daemon/graphdriver/btrfs/btrfs.go
History View file @ 07ff4f1
... ... 
@@ -32,7 +32,7 @@ import (
32 32 
 	"github.com/docker/docker/pkg/mount"
33 33 
 	"github.com/docker/docker/pkg/parsers"
34 34 
 	"github.com/docker/docker/pkg/system"
35 
-	"github.com/docker/go-units"
35 
+	units "github.com/docker/go-units"
36 36 
 	"github.com/opencontainers/selinux/go-selinux/label"
37 37 
 	"github.com/pkg/errors"
38 38 
 	"github.com/sirupsen/logrus"
daemon/graphdriver/devmapper/deviceset.go
History View file @ 07ff4f1
... ... 
@@ -27,7 +27,7 @@ import (
27 27 
 	"github.com/docker/docker/pkg/mount"
28 28 
 	"github.com/docker/docker/pkg/parsers"
29 29 
 	"github.com/docker/docker/pkg/parsers/kernel"
30 
-	"github.com/docker/go-units"
30 
+	units "github.com/docker/go-units"
31 31 
 	"github.com/opencontainers/selinux/go-selinux/label"
32 32 
 	"github.com/pkg/errors"
33 33 
 	"github.com/sirupsen/logrus"
daemon/graphdriver/devmapper/driver.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/docker/pkg/idtools"
16 16 
 	"github.com/docker/docker/pkg/locker"
17 17 
 	"github.com/docker/docker/pkg/mount"
18 
-	"github.com/docker/go-units"
18 
+	units "github.com/docker/go-units"
19 19 
 	"github.com/sirupsen/logrus"
20 20 
 	"golang.org/x/sys/unix"
21 21 
 )
daemon/graphdriver/graphtest/graphtest_unix.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/docker/daemon/graphdriver"
16 16 
 	"github.com/docker/docker/daemon/graphdriver/quota"
17 17 
 	"github.com/docker/docker/pkg/stringid"
18 
-	"github.com/docker/go-units"
18 
+	units "github.com/docker/go-units"
19 19 
 	"golang.org/x/sys/unix"
20 20 
 	"gotest.tools/assert"
21 21 
 	is "gotest.tools/assert/cmp"
daemon/graphdriver/overlay2/overlay.go
History View file @ 07ff4f1
... ... 
@@ -31,7 +31,7 @@ import (
31 31 
 	"github.com/docker/docker/pkg/parsers"
32 32 
 	"github.com/docker/docker/pkg/parsers/kernel"
33 33 
 	"github.com/docker/docker/pkg/system"
34 
-	"github.com/docker/go-units"
34 
+	units "github.com/docker/go-units"
35 35 
 	rsystem "github.com/opencontainers/runc/libcontainer/system"
36 36 
 	"github.com/opencontainers/selinux/go-selinux/label"
37 37 
 	"github.com/sirupsen/logrus"
daemon/graphdriver/plugin.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/docker/docker/errdefs"
8 8 
 	"github.com/docker/docker/pkg/plugingetter"
9 9 
 	"github.com/docker/docker/pkg/plugins"
10 
-	"github.com/docker/docker/plugin/v2"
10 
+	v2 "github.com/docker/docker/plugin/v2"
11 11 
 	"github.com/pkg/errors"
12 12 
 )
13 13
daemon/graphdriver/vfs/driver.go
History View file @ 07ff4f1
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/docker/docker/pkg/idtools"
13 13 
 	"github.com/docker/docker/pkg/parsers"
14 14 
 	"github.com/docker/docker/pkg/system"
15 
-	"github.com/docker/go-units"
15 
+	units "github.com/docker/go-units"
16 16 
 	"github.com/opencontainers/selinux/go-selinux/label"
17 17 
 	"github.com/pkg/errors"
18 18 
 )
daemon/graphdriver/windows/windows.go
History View file @ 07ff4f1
... ... 
@@ -19,7 +19,7 @@ import (
19 19 
 	"time"
20 20 
 	"unsafe"
21 21
22 
-	"github.com/Microsoft/go-winio"
22 
+	winio "github.com/Microsoft/go-winio"
23 23 
 	"github.com/Microsoft/go-winio/archive/tar"
24 24 
 	"github.com/Microsoft/go-winio/backuptar"
25 25 
 	"github.com/Microsoft/go-winio/vhd"
daemon/images/image_prune.go
History View file @ 07ff4f1
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/docker/docker/errdefs"
14 14 
 	"github.com/docker/docker/image"
15 15 
 	"github.com/docker/docker/layer"
16 
-	"github.com/opencontainers/go-digest"
16 
+	digest "github.com/opencontainers/go-digest"
17 17 
 	"github.com/pkg/errors"
18 18 
 	"github.com/sirupsen/logrus"
19 19 
 )
daemon/images/image_pull.go
History View file @ 07ff4f1
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/docker/docker/errdefs"
15 15 
 	"github.com/docker/docker/pkg/progress"
16 16 
 	"github.com/docker/docker/registry"
17 
-	"github.com/opencontainers/go-digest"
17 
+	digest "github.com/opencontainers/go-digest"
18 18 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
19 19 
 )
20 20
daemon/images/locals.go
History View file @ 07ff4f1
... ... 
@@ -3,7 +3,7 @@ package images // import "github.com/docker/docker/daemon/images"
3 3 
 import (
4 4 
 	"fmt"
5 5
6 
-	"github.com/docker/go-metrics"
6 
+	metrics "github.com/docker/go-metrics"
7 7 
 )
8 8
9 9 
 type invalidFilter struct {
daemon/images/service.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	dockerreference "github.com/docker/docker/reference"
16 16 
 	"github.com/docker/docker/registry"
17 17 
 	"github.com/docker/libtrust"
18 
-	"github.com/opencontainers/go-digest"
18 
+	digest "github.com/opencontainers/go-digest"
19 19 
 	"github.com/pkg/errors"
20 20 
 	"github.com/sirupsen/logrus"
21 21 
 )
daemon/info.go
History View file @ 07ff4f1
... ... 
@@ -21,7 +21,7 @@ import (
21 21 
 	"github.com/docker/docker/pkg/system"
22 22 
 	"github.com/docker/docker/registry"
23 23 
 	"github.com/docker/go-connections/sockets"
24 
-	"github.com/docker/go-metrics"
24 
+	metrics "github.com/docker/go-metrics"
25 25 
 	"github.com/sirupsen/logrus"
26 26 
 )
27 27
daemon/list_test.go
History View file @ 07ff4f1
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/docker/docker/container"
13 13 
 	"github.com/docker/docker/image"
14 14 
 	"github.com/google/uuid"
15 
-	"github.com/opencontainers/go-digest"
15 
+	digest "github.com/opencontainers/go-digest"
16 16 
 	"gotest.tools/assert"
17 17 
 	is "gotest.tools/assert/cmp"
18 18 
 )
daemon/listeners/listeners_windows.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"net"
7 7 
 	"strings"
8 8
9 
-	"github.com/Microsoft/go-winio"
9 
+	winio "github.com/Microsoft/go-winio"
10 10 
 	"github.com/docker/go-connections/sockets"
11 11 
 )
12 12
daemon/logger/factory.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7
8 8 
 	containertypes "github.com/docker/docker/api/types/container"
9 9 
 	"github.com/docker/docker/pkg/plugingetter"
10 
-	"github.com/docker/go-units"
10 
+	units "github.com/docker/go-units"
11 11 
 	"github.com/pkg/errors"
12 12 
 )
13 13
daemon/logger/fluentd/fluentd.go
History View file @ 07ff4f1
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/docker/docker/daemon/logger"
15 15 
 	"github.com/docker/docker/daemon/logger/loggerutils"
16 16 
 	"github.com/docker/docker/pkg/urlutil"
17 
-	"github.com/docker/go-units"
17 
+	units "github.com/docker/go-units"
18 18 
 	"github.com/fluent/fluent-logger-golang/fluent"
19 19 
 	"github.com/pkg/errors"
20 20 
 	"github.com/sirupsen/logrus"
daemon/logger/jsonfilelog/jsonfilelog.go
History View file @ 07ff4f1
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/docker/docker/daemon/logger"
14 14 
 	"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
15 15 
 	"github.com/docker/docker/daemon/logger/loggerutils"
16 
-	"github.com/docker/go-units"
16 
+	units "github.com/docker/go-units"
17 17 
 	"github.com/pkg/errors"
18 18 
 	"github.com/sirupsen/logrus"
19 19 
 )
daemon/logger/local/local.go
History View file @ 07ff4f1
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/docker/docker/daemon/logger"
13 13 
 	"github.com/docker/docker/daemon/logger/loggerutils"
14 14 
 	"github.com/docker/docker/errdefs"
15 
-	"github.com/docker/go-units"
15 
+	units "github.com/docker/go-units"
16 16 
 	"github.com/pkg/errors"
17 17 
 	"github.com/sirupsen/logrus"
18 18 
 )
daemon/logger/metrics.go
History View file @ 07ff4f1
... ... 
@@ -1,7 +1,7 @@
1 1 
 package logger // import "github.com/docker/docker/daemon/logger"
2 2
3 3 
 import (
4 
-	"github.com/docker/go-metrics"
4 
+	metrics "github.com/docker/go-metrics"
5 5 
 )
6 6
7 7 
 var (
daemon/metrics.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"github.com/docker/docker/errdefs"
7 7 
 	"github.com/docker/docker/pkg/plugingetter"
8 8 
 	"github.com/docker/docker/pkg/plugins"
9 
-	"github.com/docker/go-metrics"
9 
+	metrics "github.com/docker/go-metrics"
10 10 
 	"github.com/pkg/errors"
11 11 
 	"github.com/prometheus/client_golang/prometheus"
12 12 
 	"github.com/sirupsen/logrus"
daemon/metrics_unix.go
History View file @ 07ff4f1
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"github.com/docker/docker/pkg/plugingetter"
11 11 
 	"github.com/docker/docker/pkg/plugins"
12 12 
 	"github.com/docker/docker/plugin"
13 
-	"github.com/docker/go-metrics"
14 
-	"github.com/opencontainers/runtime-spec/specs-go"
13 
+	metrics "github.com/docker/go-metrics"
14 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
15 15 
 	"github.com/pkg/errors"
16 16 
 	"github.com/sirupsen/logrus"
17 17 
 	"golang.org/x/sys/unix"
daemon/nvidia_linux.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8
9 9 
 	"github.com/containerd/containerd/contrib/nvidia"
10 10 
 	"github.com/docker/docker/pkg/capabilities"
11 
-	"github.com/opencontainers/runtime-spec/specs-go"
11 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
12 12 
 	"github.com/pkg/errors"
13 13 
 )
14 14
daemon/oci_linux.go
History View file @ 07ff4f1
... ... 
@@ -27,7 +27,7 @@ import (
27 27 
 	"github.com/opencontainers/runc/libcontainer/devices"
28 28 
 	rsystem "github.com/opencontainers/runc/libcontainer/system"
29 29 
 	"github.com/opencontainers/runc/libcontainer/user"
30 
-	"github.com/opencontainers/runtime-spec/specs-go"
30 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
31 31 
 	"github.com/pkg/errors"
32 32 
 	"github.com/sirupsen/logrus"
33 33 
 	"golang.org/x/sys/unix"
daemon/oci_utils.go
History View file @ 07ff4f1
... ... 
@@ -2,7 +2,7 @@ package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 4 
 	"github.com/docker/docker/container"
5 
-	"github.com/opencontainers/runtime-spec/specs-go"
5 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
6 6 
 )
7 7
8 8 
 func setLinuxDomainname(c *container.Container, s *specs.Spec) {
daemon/oci_windows.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/docker/oci/caps"
16 16 
 	"github.com/docker/docker/pkg/sysinfo"
17 17 
 	"github.com/docker/docker/pkg/system"
18 
-	"github.com/opencontainers/runtime-spec/specs-go"
18 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
19 19 
 	"github.com/pkg/errors"
20 20 
 	"github.com/sirupsen/logrus"
21 21 
 	"golang.org/x/sys/windows/registry"
daemon/oci_windows_test.go
History View file @ 07ff4f1
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/docker/docker/container"
15 15 
 	swarmagent "github.com/docker/swarmkit/agent"
16 16 
 	swarmapi "github.com/docker/swarmkit/api"
17 
-	"github.com/opencontainers/runtime-spec/specs-go"
17 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
18 18 
 	"golang.org/x/sys/windows/registry"
19 19 
 	"gotest.tools/assert"
20 20 
 )
daemon/seccomp_linux.go
History View file @ 07ff4f1
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	coci "github.com/containerd/containerd/oci"
11 11 
 	"github.com/docker/docker/container"
12 12 
 	"github.com/docker/docker/profiles/seccomp"
13 
-	"github.com/opencontainers/runtime-spec/specs-go"
13 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
14 14 
 	"github.com/sirupsen/logrus"
15 15 
 )
16 16
daemon/selinux_linux.go
History View file @ 07ff4f1
... ... 
@@ -1,6 +1,6 @@
1 1 
 package daemon // import "github.com/docker/docker/daemon"
2 2
3 
-import "github.com/opencontainers/selinux/go-selinux"
3 
+import selinux "github.com/opencontainers/selinux/go-selinux"
4 4
5 5 
 func selinuxSetDisabled() {
6 6 
 	selinux.SetDisabled()
daemon/top_windows.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"time"
8 8
9 9 
 	containertypes "github.com/docker/docker/api/types/container"
10 
-	"github.com/docker/go-units"
10 
+	units "github.com/docker/go-units"
11 11 
 )
12 12
13 13 
 // ContainerTop handles `docker top` client requests.
daemon/update_linux.go
History View file @ 07ff4f1
... ... 
@@ -5,7 +5,7 @@ import (
5 5
6 6 
 	"github.com/docker/docker/api/types/container"
7 7 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
8 
-	"github.com/opencontainers/runtime-spec/specs-go"
8 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
9 9 
 )
10 10
11 11 
 func toContainerdResources(resources container.Resources) *libcontainerdtypes.Resources {
distribution/config.go
History View file @ 07ff4f1
... ... 
@@ -19,7 +19,7 @@ import (
19 19 
 	refstore "github.com/docker/docker/reference"
20 20 
 	"github.com/docker/docker/registry"
21 21 
 	"github.com/docker/libtrust"
22 
-	"github.com/opencontainers/go-digest"
22 
+	digest "github.com/opencontainers/go-digest"
23 23 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
24 24 
 )
25 25
distribution/errors.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/distribution"
10 10 
 	"github.com/docker/distribution/reference"
11 11 
 	"github.com/docker/distribution/registry/api/errcode"
12 
-	"github.com/docker/distribution/registry/api/v2"
12 
+	v2 "github.com/docker/distribution/registry/api/v2"
13 13 
 	"github.com/docker/distribution/registry/client"
14 14 
 	"github.com/docker/distribution/registry/client/auth"
15 15 
 	"github.com/docker/docker/distribution/xfer"
distribution/errors_test.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"testing"
8 8
9 9 
 	"github.com/docker/distribution/registry/api/errcode"
10 
-	"github.com/docker/distribution/registry/api/v2"
10 
+	v2 "github.com/docker/distribution/registry/api/v2"
11 11 
 	"github.com/docker/distribution/registry/client"
12 12 
 )
13 13
distribution/metadata/v1_id_service.go
History View file @ 07ff4f1
... ... 
@@ -1,7 +1,7 @@
1 1 
 package metadata // import "github.com/docker/docker/distribution/metadata"
2 2
3 3 
 import (
4 
-	"github.com/docker/docker/image/v1"
4 
+	v1 "github.com/docker/docker/image/v1"
5 5 
 	"github.com/docker/docker/layer"
6 6 
 	"github.com/pkg/errors"
7 7 
 )
distribution/metadata/v2_metadata_service.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9
10 10 
 	"github.com/docker/docker/api/types"
11 11 
 	"github.com/docker/docker/layer"
12 
-	"github.com/opencontainers/go-digest"
12 
+	digest "github.com/opencontainers/go-digest"
13 13 
 )
14 14
15 15 
 // V2MetadataService maps layer IDs to a set of known metadata for
distribution/metadata/v2_metadata_service_test.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/docker/layer"
12 
-	"github.com/opencontainers/go-digest"
12 
+	digest "github.com/opencontainers/go-digest"
13 13 
 )
14 14
15 15 
 func TestV2MetadataService(t *testing.T) {
distribution/pull.go
History View file @ 07ff4f1
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"github.com/docker/docker/pkg/progress"
11 11 
 	refstore "github.com/docker/docker/reference"
12 12 
 	"github.com/docker/docker/registry"
13 
-	"github.com/opencontainers/go-digest"
13 
+	digest "github.com/opencontainers/go-digest"
14 14 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
15 15 
 	"github.com/pkg/errors"
16 16 
 	"github.com/sirupsen/logrus"
distribution/pull_v2.go
History View file @ 07ff4f1
... ... 
@@ -31,7 +31,7 @@ import (
31 31 
 	"github.com/docker/docker/pkg/system"
32 32 
 	refstore "github.com/docker/docker/reference"
33 33 
 	"github.com/docker/docker/registry"
34 
-	"github.com/opencontainers/go-digest"
34 
+	digest "github.com/opencontainers/go-digest"
35 35 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
36 36 
 	"github.com/pkg/errors"
37 37 
 	"github.com/sirupsen/logrus"
distribution/pull_v2_test.go
History View file @ 07ff4f1
... ... 
@@ -12,7 +12,7 @@ import (
12 12
13 13 
 	"github.com/docker/distribution/manifest/schema1"
14 14 
 	"github.com/docker/distribution/reference"
15 
-	"github.com/opencontainers/go-digest"
15 
+	digest "github.com/opencontainers/go-digest"
16 16 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
17 17 
 	"gotest.tools/assert"
18 18 
 	is "gotest.tools/assert/cmp"
distribution/push_v2.go
History View file @ 07ff4f1
... ... 
@@ -24,7 +24,7 @@ import (
24 24 
 	"github.com/docker/docker/pkg/progress"
25 25 
 	"github.com/docker/docker/pkg/stringid"
26 26 
 	"github.com/docker/docker/registry"
27 
-	"github.com/opencontainers/go-digest"
27 
+	digest "github.com/opencontainers/go-digest"
28 28 
 	"github.com/sirupsen/logrus"
29 29 
 )
30 30
distribution/push_v2_test.go
History View file @ 07ff4f1
... ... 
@@ -17,7 +17,7 @@ import (
17 17 
 	"github.com/docker/docker/pkg/progress"
18 18 
 	refstore "github.com/docker/docker/reference"
19 19 
 	"github.com/docker/docker/registry"
20 
-	"github.com/opencontainers/go-digest"
20 
+	digest "github.com/opencontainers/go-digest"
21 21 
 )
22 22
23 23 
 func TestGetRepositoryMountCandidates(t *testing.T) {
distribution/xfer/download_test.go
History View file @ 07ff4f1
... ... 
@@ -16,7 +16,7 @@ import (
16 16 
 	"github.com/docker/docker/image"
17 17 
 	"github.com/docker/docker/layer"
18 18 
 	"github.com/docker/docker/pkg/progress"
19 
-	"github.com/opencontainers/go-digest"
19 
+	digest "github.com/opencontainers/go-digest"
20 20 
 )
21 21
22 22 
 const maxDownloadConcurrency = 3
image/fs.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"sync"
9 9
10 10 
 	"github.com/docker/docker/pkg/ioutils"
11 
-	"github.com/opencontainers/go-digest"
11 
+	digest "github.com/opencontainers/go-digest"
12 12 
 	"github.com/pkg/errors"
13 13 
 	"github.com/sirupsen/logrus"
14 14 
 )
image/fs_test.go
History View file @ 07ff4f1
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"path/filepath"
11 11 
 	"testing"
12 12
13 
-	"github.com/opencontainers/go-digest"
13 
+	digest "github.com/opencontainers/go-digest"
14 14 
 	"gotest.tools/assert"
15 15 
 	is "gotest.tools/assert/cmp"
16 16 
 )
image/image.go
History View file @ 07ff4f1
... ... 
@@ -11,7 +11,7 @@ import (
11 11 
 	"github.com/docker/docker/api/types/container"
12 12 
 	"github.com/docker/docker/dockerversion"
13 13 
 	"github.com/docker/docker/layer"
14 
-	"github.com/opencontainers/go-digest"
14 
+	digest "github.com/opencontainers/go-digest"
15 15 
 )
16 16
17 17 
 // ID is the content-addressable ID of an image.
image/store.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/distribution/digestset"
10 10 
 	"github.com/docker/docker/layer"
11 11 
 	"github.com/docker/docker/pkg/system"
12 
-	"github.com/opencontainers/go-digest"
12 
+	digest "github.com/opencontainers/go-digest"
13 13 
 	"github.com/pkg/errors"
14 14 
 	"github.com/sirupsen/logrus"
15 15 
 )
image/store_test.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"testing"
7 7
8 8 
 	"github.com/docker/docker/layer"
9 
-	"github.com/opencontainers/go-digest"
9 
+	digest "github.com/opencontainers/go-digest"
10 10 
 	"gotest.tools/assert"
11 11 
 	"gotest.tools/assert/cmp"
12 12 
 )
image/tarexport/load.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/distribution"
16 16 
 	"github.com/docker/distribution/reference"
17 17 
 	"github.com/docker/docker/image"
18 
-	"github.com/docker/docker/image/v1"
18 
+	v1 "github.com/docker/docker/image/v1"
19 19 
 	"github.com/docker/docker/layer"
20 20 
 	"github.com/docker/docker/pkg/archive"
21 21 
 	"github.com/docker/docker/pkg/chrootarchive"
... ... 
@@ -24,7 +24,7 @@ import (
24 24 
 	"github.com/docker/docker/pkg/stringid"
25 25 
 	"github.com/docker/docker/pkg/symlink"
26 26 
 	"github.com/docker/docker/pkg/system"
27 
-	"github.com/opencontainers/go-digest"
27 
+	digest "github.com/opencontainers/go-digest"
28 28 
 	"github.com/sirupsen/logrus"
29 29 
 )
30 30
image/tarexport/save.go
History View file @ 07ff4f1
... ... 
@@ -14,11 +14,11 @@ import (
14 14 
 	"github.com/docker/distribution"
15 15 
 	"github.com/docker/distribution/reference"
16 16 
 	"github.com/docker/docker/image"
17 
-	"github.com/docker/docker/image/v1"
17 
+	v1 "github.com/docker/docker/image/v1"
18 18 
 	"github.com/docker/docker/layer"
19 19 
 	"github.com/docker/docker/pkg/archive"
20 20 
 	"github.com/docker/docker/pkg/system"
21 
-	"github.com/opencontainers/go-digest"
21 
+	digest "github.com/opencontainers/go-digest"
22 22 
 	"github.com/pkg/errors"
23 23 
 )
24 24
image/v1/imagev1.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/docker/image"
10 10 
 	"github.com/docker/docker/layer"
11 11 
 	"github.com/docker/docker/pkg/stringid"
12 
-	"github.com/opencontainers/go-digest"
12 
+	digest "github.com/opencontainers/go-digest"
13 13 
 	"github.com/sirupsen/logrus"
14 14 
 )
15 15
integration-cli/docker_cli_build_test.go
History View file @ 07ff4f1
... ... 
@@ -26,7 +26,7 @@ import (
26 26 
 	"github.com/docker/docker/testutil/fakegit"
27 27 
 	"github.com/docker/docker/testutil/fakestorage"
28 28 
 	"github.com/moby/buildkit/frontend/dockerfile/command"
29 
-	"github.com/opencontainers/go-digest"
29 
+	digest "github.com/opencontainers/go-digest"
30 30 
 	"gotest.tools/assert"
31 31 
 	"gotest.tools/assert/cmp"
32 32 
 	"gotest.tools/icmd"
integration-cli/docker_cli_build_unix_test.go
History View file @ 07ff4f1
... ... 
@@ -19,7 +19,7 @@ import (
19 19 
 	"github.com/docker/docker/integration-cli/cli"
20 20 
 	"github.com/docker/docker/integration-cli/cli/build"
21 21 
 	"github.com/docker/docker/testutil/fakecontext"
22 
-	"github.com/docker/go-units"
22 
+	units "github.com/docker/go-units"
23 23 
 	"gotest.tools/assert"
24 24 
 	"gotest.tools/icmd"
25 25 
 )
integration-cli/docker_cli_by_digest_test.go
History View file @ 07ff4f1
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/docker/docker/api/types"
15 15 
 	"github.com/docker/docker/integration-cli/cli"
16 16 
 	"github.com/docker/docker/integration-cli/cli/build"
17 
-	"github.com/opencontainers/go-digest"
17 
+	digest "github.com/opencontainers/go-digest"
18 18 
 	"gotest.tools/assert"
19 19 
 	is "gotest.tools/assert/cmp"
20 20 
 )
integration-cli/docker_cli_daemon_test.go
History View file @ 07ff4f1
... ... 
@@ -34,7 +34,7 @@ import (
34 34 
 	"github.com/docker/docker/opts"
35 35 
 	"github.com/docker/docker/pkg/mount"
36 36 
 	testdaemon "github.com/docker/docker/testutil/daemon"
37 
-	"github.com/docker/go-units"
37 
+	units "github.com/docker/go-units"
38 38 
 	"github.com/docker/libnetwork/iptables"
39 39 
 	"github.com/docker/libtrust"
40 40 
 	"golang.org/x/sys/unix"
integration-cli/docker_cli_pull_local_test.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/distribution/manifest/manifestlist"
16 16 
 	"github.com/docker/distribution/manifest/schema2"
17 17 
 	"github.com/docker/docker/integration-cli/cli/build"
18 
-	"github.com/opencontainers/go-digest"
18 
+	digest "github.com/opencontainers/go-digest"
19 19 
 	"gotest.tools/assert"
20 20 
 	"gotest.tools/icmd"
21 21 
 )
integration-cli/docker_cli_pull_test.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"testing"
9 9 
 	"time"
10 10
11 
-	"github.com/opencontainers/go-digest"
11 
+	digest "github.com/opencontainers/go-digest"
12 12 
 	"gotest.tools/assert"
13 13 
 	is "gotest.tools/assert/cmp"
14 14 
 )
integration-cli/docker_cli_save_load_test.go
History View file @ 07ff4f1
... ... 
@@ -17,7 +17,7 @@ import (
17 17 
 	"time"
18 18
19 19 
 	"github.com/docker/docker/integration-cli/cli/build"
20 
-	"github.com/opencontainers/go-digest"
20 
+	digest "github.com/opencontainers/go-digest"
21 21 
 	"gotest.tools/assert"
22 22 
 	is "gotest.tools/assert/cmp"
23 23 
 	"gotest.tools/icmd"
layer/empty_test.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"io"
5 5 
 	"testing"
6 6
7 
-	"github.com/opencontainers/go-digest"
7 
+	digest "github.com/opencontainers/go-digest"
8 8 
 )
9 9
10 10 
 func TestEmptyLayer(t *testing.T) {
layer/filestore_test.go
History View file @ 07ff4f1
... ... 
@@ -11,7 +11,7 @@ import (
11 11 
 	"testing"
12 12
13 13 
 	"github.com/docker/docker/pkg/stringid"
14 
-	"github.com/opencontainers/go-digest"
14 
+	digest "github.com/opencontainers/go-digest"
15 15 
 )
16 16
17 17 
 func randomLayerID(seed int64) ChainID {
layer/layer.go
History View file @ 07ff4f1
... ... 
@@ -16,7 +16,7 @@ import (
16 16 
 	"github.com/docker/distribution"
17 17 
 	"github.com/docker/docker/pkg/archive"
18 18 
 	"github.com/docker/docker/pkg/containerfs"
19 
-	"github.com/opencontainers/go-digest"
19 
+	digest "github.com/opencontainers/go-digest"
20 20 
 	"github.com/sirupsen/logrus"
21 21 
 )
22 22
layer/layer_store.go
History View file @ 07ff4f1
... ... 
@@ -16,7 +16,7 @@ import (
16 16 
 	"github.com/docker/docker/pkg/plugingetter"
17 17 
 	"github.com/docker/docker/pkg/stringid"
18 18 
 	"github.com/docker/docker/pkg/system"
19 
-	"github.com/opencontainers/go-digest"
19 
+	digest "github.com/opencontainers/go-digest"
20 20 
 	"github.com/sirupsen/logrus"
21 21 
 	"github.com/vbatts/tar-split/tar/asm"
22 22 
 	"github.com/vbatts/tar-split/tar/storage"
layer/layer_test.go
History View file @ 07ff4f1
... ... 
@@ -17,7 +17,7 @@ import (
17 17 
 	"github.com/docker/docker/pkg/containerfs"
18 18 
 	"github.com/docker/docker/pkg/idtools"
19 19 
 	"github.com/docker/docker/pkg/stringid"
20 
-	"github.com/opencontainers/go-digest"
20 
+	digest "github.com/opencontainers/go-digest"
21 21 
 )
22 22
23 23 
 func init() {
layer/migration.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"io"
7 7 
 	"os"
8 8
9 
-	"github.com/opencontainers/go-digest"
9 
+	digest "github.com/opencontainers/go-digest"
10 10 
 	"github.com/sirupsen/logrus"
11 11 
 	"github.com/vbatts/tar-split/tar/asm"
12 12 
 	"github.com/vbatts/tar-split/tar/storage"
layer/ro_layer.go
History View file @ 07ff4f1
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"io"
6 6
7 7 
 	"github.com/docker/distribution"
8 
-	"github.com/opencontainers/go-digest"
8 
+	digest "github.com/opencontainers/go-digest"
9 9 
 )
10 10
11 11 
 type roLayer struct {
libcontainerd/remote/client_linux.go
History View file @ 07ff4f1
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/containerd/containerd/containers"
13 13 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
14 14 
 	"github.com/docker/docker/pkg/idtools"
15 
-	"github.com/opencontainers/runtime-spec/specs-go"
15 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
16 16 
 	"github.com/sirupsen/logrus"
17 17 
 )
18 18
libcontainerd/types/types.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6
7 7 
 	"github.com/containerd/containerd"
8 8 
 	"github.com/containerd/containerd/cio"
9 
-	"github.com/opencontainers/runtime-spec/specs-go"
9 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
10 10 
 )
11 11
12 12 
 // EventType represents a possible event from libcontainerd
libcontainerd/types/types_linux.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"time"
5 5
6 6 
 	"github.com/containerd/cgroups"
7 
-	"github.com/opencontainers/runtime-spec/specs-go"
7 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
8 8 
 )
9 9
10 10 
 // Summary is not used on linux
oci/defaults.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"os"
5 5 
 	"runtime"
6 6
7 
-	"github.com/opencontainers/runtime-spec/specs-go"
7 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
8 8 
 )
9 9
10 10 
 func iPtr(i int64) *int64        { return &i }
oci/devices_linux.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8
9 9 
 	"github.com/opencontainers/runc/libcontainer/configs"
10 10 
 	"github.com/opencontainers/runc/libcontainer/devices"
11 
-	"github.com/opencontainers/runtime-spec/specs-go"
11 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
12 12 
 )
13 13
14 14 
 // Device transforms a libcontainer configs.Device to a specs.LinuxDevice object.
oci/namespaces.go
History View file @ 07ff4f1
... ... 
@@ -1,6 +1,6 @@
1 1 
 package oci // import "github.com/docker/docker/oci"
2 2
3 
-import "github.com/opencontainers/runtime-spec/specs-go"
3 
+import specs "github.com/opencontainers/runtime-spec/specs-go"
4 4
5 5 
 // RemoveNamespace removes the `nsType` namespace from OCI spec `s`
6 6 
 func RemoveNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) {
opts/opts.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"regexp"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/go-units"
10 
+	units "github.com/docker/go-units"
11 11 
 )
12 12
13 13 
 var (
opts/ulimit.go
History View file @ 07ff4f1
... ... 
@@ -3,7 +3,7 @@ package opts // import "github.com/docker/docker/opts"
3 3 
 import (
4 4 
 	"fmt"
5 5
6 
-	"github.com/docker/go-units"
6 
+	units "github.com/docker/go-units"
7 7 
 )
8 8
9 9 
 // UlimitOpt defines a map of Ulimits
opts/ulimit_test.go
History View file @ 07ff4f1
... ... 
@@ -3,7 +3,7 @@ package opts // import "github.com/docker/docker/opts"
3 3 
 import (
4 4 
 	"testing"
5 5
6 
-	"github.com/docker/go-units"
6 
+	units "github.com/docker/go-units"
7 7 
 )
8 8
9 9 
 func TestUlimitOpt(t *testing.T) {
pkg/jsonmessage/jsonmessage.go
History View file @ 07ff4f1
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"time"
9 9
10 10 
 	"github.com/docker/docker/pkg/term"
11 
-	"github.com/docker/go-units"
11 
+	units "github.com/docker/go-units"
12 12 
 	"github.com/morikuni/aec"
13 13 
 )
14 14
pkg/parsers/kernel/kernel_darwin.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"os/exec"
10 10 
 	"strings"
11 11
12 
-	"github.com/mattn/go-shellwords"
12 
+	shellwords "github.com/mattn/go-shellwords"
13 13 
 )
14 14
15 15 
 // GetKernelVersion gets the current kernel version.
pkg/parsers/operatingsystem/operatingsystem_linux.go
History View file @ 07ff4f1
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"os"
11 11 
 	"strings"
12 12
13 
-	"github.com/mattn/go-shellwords"
13 
+	shellwords "github.com/mattn/go-shellwords"
14 14 
 )
15 15
16 16 
 var (
pkg/system/meminfo_linux.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"strconv"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/go-units"
10 
+	units "github.com/docker/go-units"
11 11 
 )
12 12
13 13 
 // ReadMemInfo retrieves memory statistics of the host system and returns a
pkg/system/meminfo_unix_test.go
History View file @ 07ff4f1
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"strings"
7 7 
 	"testing"
8 8
9 
-	"github.com/docker/go-units"
9 
+	units "github.com/docker/go-units"
10 10 
 )
11 11
12 12 
 // TestMemInfo tests parseMemInfo with a static meminfo string
pkg/term/term_windows.go
History View file @ 07ff4f1
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"syscall" // used for STD_INPUT_HANDLE, STD_OUTPUT_HANDLE and STD_ERROR_HANDLE
8 8
9 9 
 	"github.com/Azure/go-ansiterm/winterm"
10 
-	"github.com/docker/docker/pkg/term/windows"
10 
+	windowsconsole "github.com/docker/docker/pkg/term/windows"
11 11 
 )
12 12
13 13 
 // State holds the console mode for the terminal.
pkg/term/windows/windows.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"os"
10 10 
 	"sync"
11 11
12 
-	"github.com/Azure/go-ansiterm"
12 
+	ansiterm "github.com/Azure/go-ansiterm"
13 13 
 	"github.com/sirupsen/logrus"
14 14 
 )
15 15
plugin/backend_linux.go
History View file @ 07ff4f1
... ... 
@@ -31,9 +31,9 @@ import (
31 31 
 	"github.com/docker/docker/pkg/pools"
32 32 
 	"github.com/docker/docker/pkg/progress"
33 33 
 	"github.com/docker/docker/pkg/system"
34 
-	"github.com/docker/docker/plugin/v2"
34 
+	v2 "github.com/docker/docker/plugin/v2"
35 35 
 	refstore "github.com/docker/docker/reference"
36 
-	"github.com/opencontainers/go-digest"
36 
+	digest "github.com/opencontainers/go-digest"
37 37 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
38 38 
 	"github.com/pkg/errors"
39 39 
 	"github.com/sirupsen/logrus"
plugin/blobstore.go
History View file @ 07ff4f1
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"github.com/docker/docker/pkg/archive"
16 16 
 	"github.com/docker/docker/pkg/chrootarchive"
17 17 
 	"github.com/docker/docker/pkg/progress"
18 
-	"github.com/opencontainers/go-digest"
18 
+	digest "github.com/opencontainers/go-digest"
19 19 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
20 20 
 	"github.com/pkg/errors"
21 21 
 	"github.com/sirupsen/logrus"
plugin/defs.go
History View file @ 07ff4f1
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"sync"
7 7
8 8 
 	"github.com/docker/docker/pkg/plugins"
9 
-	"github.com/docker/docker/plugin/v2"
10 
-	"github.com/opencontainers/runtime-spec/specs-go"
9 
+	v2 "github.com/docker/docker/plugin/v2"
10 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
11 11 
 )
12 12
13 13 
 // Store manages the plugin inventory in memory and on-disk
plugin/executor/containerd/containerd.go
History View file @ 07ff4f1
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/docker/docker/errdefs"
13 13 
 	"github.com/docker/docker/libcontainerd"
14 14 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
15 
-	"github.com/opencontainers/runtime-spec/specs-go"
15 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
16 16 
 	"github.com/pkg/errors"
17 17 
 	"github.com/sirupsen/logrus"
18 18 
 )
plugin/manager.go
History View file @ 07ff4f1
... ... 
@@ -21,10 +21,10 @@ import (
21 21 
 	"github.com/docker/docker/pkg/mount"
22 22 
 	"github.com/docker/docker/pkg/pubsub"
23 23 
 	"github.com/docker/docker/pkg/system"
24 
-	"github.com/docker/docker/plugin/v2"
24 
+	v2 "github.com/docker/docker/plugin/v2"
25 25 
 	"github.com/docker/docker/registry"
26 
-	"github.com/opencontainers/go-digest"
27 
-	"github.com/opencontainers/runtime-spec/specs-go"
26 
+	digest "github.com/opencontainers/go-digest"
27 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
28 28 
 	"github.com/pkg/errors"
29 29 
 	"github.com/sirupsen/logrus"
30 30 
 )
plugin/manager_linux.go
History View file @ 07ff4f1
... ... 
@@ -15,8 +15,8 @@ import (
15 15 
 	"github.com/docker/docker/pkg/mount"
16 16 
 	"github.com/docker/docker/pkg/plugins"
17 17 
 	"github.com/docker/docker/pkg/stringid"
18 
-	"github.com/docker/docker/plugin/v2"
19 
-	"github.com/opencontainers/go-digest"
18 
+	v2 "github.com/docker/docker/plugin/v2"
19 
+	digest "github.com/opencontainers/go-digest"
20 20 
 	"github.com/pkg/errors"
21 21 
 	"github.com/sirupsen/logrus"
22 22 
 	"golang.org/x/sys/unix"
plugin/manager_linux_test.go
History View file @ 07ff4f1
... ... 
@@ -12,8 +12,8 @@ import (
12 12 
 	"github.com/docker/docker/pkg/mount"
13 13 
 	"github.com/docker/docker/pkg/stringid"
14 14 
 	"github.com/docker/docker/pkg/system"
15 
-	"github.com/docker/docker/plugin/v2"
16 
-	"github.com/opencontainers/runtime-spec/specs-go"
15 
+	v2 "github.com/docker/docker/plugin/v2"
16 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
17 17 
 	"github.com/pkg/errors"
18 18 
 	"gotest.tools/skip"
19 19 
 )
plugin/manager_windows.go
History View file @ 07ff4f1
... ... 
@@ -3,7 +3,7 @@ package plugin // import "github.com/docker/docker/plugin"
3 3 
 import (
4 4 
 	"fmt"
5 5
6 
-	"github.com/docker/docker/plugin/v2"
6 
+	v2 "github.com/docker/docker/plugin/v2"
7 7 
 	specs "github.com/opencontainers/runtime-spec/specs-go"
8 8 
 )
9 9
plugin/store.go
History View file @ 07ff4f1
... ... 
@@ -8,8 +8,8 @@ import (
8 8 
 	"github.com/docker/docker/errdefs"
9 9 
 	"github.com/docker/docker/pkg/plugingetter"
10 10 
 	"github.com/docker/docker/pkg/plugins"
11 
-	"github.com/docker/docker/plugin/v2"
12 
-	"github.com/opencontainers/runtime-spec/specs-go"
11 
+	v2 "github.com/docker/docker/plugin/v2"
12 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
13 13 
 	"github.com/pkg/errors"
14 14 
 	"github.com/sirupsen/logrus"
15 15 
 )
plugin/store_test.go
History View file @ 07ff4f1
... ... 
@@ -5,7 +5,7 @@ import (
5 5
6 6 
 	"github.com/docker/docker/api/types"
7 7 
 	"github.com/docker/docker/pkg/plugingetter"
8 
-	"github.com/docker/docker/plugin/v2"
8 
+	v2 "github.com/docker/docker/plugin/v2"
9 9 
 )
10 10
11 11 
 func TestFilterByCapNeg(t *testing.T) {
plugin/v2/plugin.go
History View file @ 07ff4f1
... ... 
@@ -11,8 +11,8 @@ import (
11 11 
 	"github.com/docker/docker/api/types"
12 12 
 	"github.com/docker/docker/pkg/plugingetter"
13 13 
 	"github.com/docker/docker/pkg/plugins"
14 
-	"github.com/opencontainers/go-digest"
15 
-	"github.com/opencontainers/runtime-spec/specs-go"
14 
+	digest "github.com/opencontainers/go-digest"
15 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
16 16 
 )
17 17
18 18 
 // Plugin represents an individual plugin.
plugin/v2/plugin_linux.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/docker/api/types"
10 10 
 	"github.com/docker/docker/oci"
11 11 
 	"github.com/docker/docker/pkg/system"
12 
-	"github.com/opencontainers/runtime-spec/specs-go"
12 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
13 13 
 	"github.com/pkg/errors"
14 14 
 )
15 15
plugin/v2/plugin_unsupported.go
History View file @ 07ff4f1
... ... 
@@ -5,7 +5,7 @@ package v2 // import "github.com/docker/docker/plugin/v2"
5 5 
 import (
6 6 
 	"errors"
7 7
8 
-	"github.com/opencontainers/runtime-spec/specs-go"
8 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
9 9 
 )
10 10
11 11 
 // InitSpec creates an OCI spec from the plugin's config.
reference/store.go
History View file @ 07ff4f1
... ... 
@@ -10,7 +10,7 @@ import (
10 10
11 11 
 	"github.com/docker/distribution/reference"
12 12 
 	"github.com/docker/docker/pkg/ioutils"
13 
-	"github.com/opencontainers/go-digest"
13 
+	digest "github.com/opencontainers/go-digest"
14 14 
 	"github.com/pkg/errors"
15 15 
 )
16 16
reference/store_test.go
History View file @ 07ff4f1
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"testing"
10 10
11 11 
 	"github.com/docker/distribution/reference"
12 
-	"github.com/opencontainers/go-digest"
12 
+	digest "github.com/opencontainers/go-digest"
13 13 
 	"gotest.tools/assert"
14 14 
 	is "gotest.tools/assert/cmp"
15 15 
 )
registry/session.go
History View file @ 07ff4f1
... ... 
@@ -3,6 +3,7 @@ package registry // import "github.com/docker/docker/registry"
3 3 
 import (
4 4 
 	"bytes"
5 5 
 	"crypto/sha256"
6 
+
6 7 
 	// this is required for some certificates
7 8 
 	_ "crypto/sha512"
8 9 
 	"encoding/hex"
rootless/specconv/specconv_linux.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"io/ioutil"
5 5 
 	"strconv"
6 6
7 
-	"github.com/opencontainers/runtime-spec/specs-go"
7 
+	specs "github.com/opencontainers/runtime-spec/specs-go"
8 8 
 )
9 9
10 10 
 // ToRootless converts spec to be compatible with "rootless" runc.
testutil/registry/registry.go
History View file @ 07ff4f1
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"time"
11 11
12 12 
 	"github.com/docker/docker/testutil"
13 
-	"github.com/opencontainers/go-digest"
13 
+	digest "github.com/opencontainers/go-digest"
14 14 
 	"gotest.tools/assert"
15 15 
 )
16 16
testutil/request/npipe_windows.go
History View file @ 07ff4f1
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"net"
5 5 
 	"time"
6 6
7 
-	"github.com/Microsoft/go-winio"
7 
+	winio "github.com/Microsoft/go-winio"
8 8 
 )
9 9
10 10 
 func npipeDial(path string, timeout time.Duration) (net.Conn, error) {