beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

goimports: fix imports

Browse source 
Format the source according to latest goimports.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-05 16:37:47 +02:00
parent 56e690f340
commit 07ff4f1de8
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
125 changed files with 137 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/server/router/distribution/distribution_routes.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/errdefs" "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" "github.com/pkg/errors"
) )

2
api/server/router/system/system.go
View file

@ -2,7 +2,7 @@ package system // import "github.com/docker/docker/api/server/router/system"
import ( import (
"github.com/docker/docker/api/server/router" "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" "github.com/docker/docker/builder/fscache"
) )

2
api/types/container/host_config.go
View file

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/go-connections/nat" "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 // CgroupnsMode represents the cgroup namespace mode of the container

2
api/types/registry/registry.go
View file

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"net" "net"
"github.com/opencontainers/image-spec/specs-go/v1" v1 "github.com/opencontainers/image-spec/specs-go/v1"
) )
// ServiceConfig stores daemon registry services configuration. // ServiceConfig stores daemon registry services configuration.

2
builder/builder-next/adapters/containerimage/pull.go
View file

@ -37,7 +37,7 @@ import (
"github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/progress"
"github.com/moby/buildkit/util/resolver" "github.com/moby/buildkit/util/resolver"
"github.com/moby/buildkit/util/tracing" "github.com/moby/buildkit/util/tracing"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"

2
builder/dockerfile/copy_windows.go
View file

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/Microsoft/go-winio" winio "github.com/Microsoft/go-winio"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"

2
builder/dockerfile/metrics.go
View file

@ -1,7 +1,7 @@
package dockerfile // import "github.com/docker/docker/builder/dockerfile" package dockerfile // import "github.com/docker/docker/builder/dockerfile"
import ( import (
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
) )
var ( var (

2
builder/remotecontext/tarsum.go
View file

@ -6,7 +6,7 @@ import (
"github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/containerfs"
iradix "github.com/hashicorp/go-immutable-radix" iradix "github.com/hashicorp/go-immutable-radix"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tonistiigi/fsutil" "github.com/tonistiigi/fsutil"
) )

2
client/image_build_test.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/go-units" units "github.com/docker/go-units"
) )
func TestImageBuildError(t *testing.T) { func TestImageBuildError(t *testing.T) {

2
client/service_create.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/distribution/reference" "github.com/docker/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

4
client/service_create_test.go
View file

@ -14,8 +14,8 @@ import (
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/specs-go/v1" v1 "github.com/opencontainers/image-spec/specs-go/v1"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
) )

2
cmd/dockerd/config_unix.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
"github.com/docker/docker/rootless" "github.com/docker/docker/rootless"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )

2
cmd/dockerd/metrics.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"net/http" "net/http"
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
container/container.go
View file

@ -36,7 +36,7 @@ import (
"github.com/docker/docker/restartmanager" "github.com/docker/docker/restartmanager"
"github.com/docker/docker/volume" "github.com/docker/docker/volume"
volumemounts "github.com/docker/docker/volume/mounts" 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" agentexec "github.com/docker/swarmkit/agent/exec"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
container/state.go
View file

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/docker/docker/api/types" "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 // State holds the current container state, and has methods to get and

2
container/view.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/hashicorp/go-memdb" memdb "github.com/hashicorp/go-memdb"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/cluster/controllers/plugin/controller.go
View file

@ -11,7 +11,7 @@ import (
"github.com/docker/docker/api/types/swarm/runtime" "github.com/docker/docker/api/types/swarm/runtime"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/docker/plugin" "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/docker/swarmkit/api"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/pkg/errors" "github.com/pkg/errors"

2
daemon/cluster/controllers/plugin/controller_test.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/docker/api/types/swarm/runtime" "github.com/docker/docker/api/types/swarm/runtime"
"github.com/docker/docker/pkg/pubsub" "github.com/docker/docker/pkg/pubsub"
"github.com/docker/docker/plugin" "github.com/docker/docker/plugin"
"github.com/docker/docker/plugin/v2" v2 "github.com/docker/docker/plugin/v2"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/cluster/executor/container/adapter.go
View file

@ -26,7 +26,7 @@ import (
"github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/log" "github.com/docker/swarmkit/log"
gogotypes "github.com/gogo/protobuf/types" gogotypes "github.com/gogo/protobuf/types"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/time/rate" "golang.org/x/time/rate"

2
daemon/config/config_unix.go
View file

@ -7,7 +7,7 @@ import (
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
"github.com/docker/go-units" units "github.com/docker/go-units"
) )
const ( const (

2
daemon/config/config_unix_test.go
View file

@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"

2
daemon/events/metrics.go
View file

@ -1,6 +1,6 @@
package events // import "github.com/docker/docker/daemon/events" package events // import "github.com/docker/docker/daemon/events"
import "github.com/docker/go-metrics" import metrics "github.com/docker/go-metrics"
var ( var (
eventsCounter metrics.Counter eventsCounter metrics.Counter

2
daemon/exec.go
View file

@ -17,7 +17,7 @@ import (
"github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/pools"
"github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/signal"
"github.com/docker/docker/pkg/term" "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/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/exec_linux.go
View file

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/daemon/exec" "github.com/docker/docker/daemon/exec"
"github.com/docker/docker/oci/caps" "github.com/docker/docker/oci/caps"
"github.com/opencontainers/runc/libcontainer/apparmor" "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 { func (daemon *Daemon) execSetPlatformOpt(c *container.Container, ec *exec.Config, p *specs.Process) error {

2
daemon/exec_linux_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/daemon/exec" "github.com/docker/docker/daemon/exec"
"github.com/opencontainers/runc/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/apparmor"
"github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"gotest.tools/assert" "gotest.tools/assert"
) )

2
daemon/graphdriver/btrfs/btrfs.go
View file

@ -32,7 +32,7 @@ import (
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/system" "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/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
daemon/graphdriver/devmapper/deviceset.go
View file

@ -27,7 +27,7 @@ import (
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/kernel" "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/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
daemon/graphdriver/devmapper/driver.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/locker" "github.com/docker/docker/pkg/locker"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
daemon/graphdriver/graphtest/graphtest_unix.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/daemon/graphdriver/quota" "github.com/docker/docker/daemon/graphdriver/quota"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/go-units" units "github.com/docker/go-units"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"

2
daemon/graphdriver/overlay2/overlay.go
View file

@ -31,7 +31,7 @@ import (
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/docker/go-units" units "github.com/docker/go-units"
rsystem "github.com/opencontainers/runc/libcontainer/system" rsystem "github.com/opencontainers/runc/libcontainer/system"
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
daemon/graphdriver/plugin.go
View file

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/plugin/v2" v2 "github.com/docker/docker/plugin/v2"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
daemon/graphdriver/vfs/driver.go
View file

@ -12,7 +12,7 @@ import (
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/system" "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/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
daemon/graphdriver/windows/windows.go
View file

@ -19,7 +19,7 @@ import (
"time" "time"
"unsafe" "unsafe"
"github.com/Microsoft/go-winio" winio "github.com/Microsoft/go-winio"
"github.com/Microsoft/go-winio/archive/tar" "github.com/Microsoft/go-winio/archive/tar"
"github.com/Microsoft/go-winio/backuptar" "github.com/Microsoft/go-winio/backuptar"
"github.com/Microsoft/go-winio/vhd" "github.com/Microsoft/go-winio/vhd"

2
daemon/images/image_prune.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/images/image_pull.go
View file

@ -14,7 +14,7 @@ import (
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
"github.com/docker/docker/registry" "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" specs "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
daemon/images/locals.go
View file

@ -3,7 +3,7 @@ package images // import "github.com/docker/docker/daemon/images"
import ( import (
"fmt" "fmt"
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
) )
type invalidFilter struct { type invalidFilter struct {

2
daemon/images/service.go
View file

@ -15,7 +15,7 @@ import (
dockerreference "github.com/docker/docker/reference" dockerreference "github.com/docker/docker/reference"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/info.go
View file

@ -21,7 +21,7 @@ import (
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/docker/go-connections/sockets" "github.com/docker/go-connections/sockets"
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/list_test.go
View file

@ -12,7 +12,7 @@ import (
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
) )

2
daemon/listeners/listeners_windows.go
View file

@ -6,7 +6,7 @@ import (
"net" "net"
"strings" "strings"
"github.com/Microsoft/go-winio" winio "github.com/Microsoft/go-winio"
"github.com/docker/go-connections/sockets" "github.com/docker/go-connections/sockets"
) )

2
daemon/logger/factory.go
View file

@ -7,7 +7,7 @@ import (
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
daemon/logger/fluentd/fluentd.go
View file

@ -14,7 +14,7 @@ import (
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/daemon/logger/loggerutils"
"github.com/docker/docker/pkg/urlutil" "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/fluent/fluent-logger-golang/fluent"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
daemon/logger/jsonfilelog/jsonfilelog.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
"github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/daemon/logger/loggerutils"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/logger/local/local.go
View file

@ -12,7 +12,7 @@ import (
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/daemon/logger/loggerutils"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
daemon/logger/metrics.go
View file

@ -1,7 +1,7 @@
package logger // import "github.com/docker/docker/daemon/logger" package logger // import "github.com/docker/docker/daemon/logger"
import ( import (
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
) )
var ( var (

2
daemon/metrics.go
View file

@ -6,7 +6,7 @@ import (
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/plugins"
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

4
daemon/metrics_unix.go
View file

@ -10,8 +10,8 @@ import (
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/plugin" "github.com/docker/docker/plugin"
"github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
"github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
daemon/nvidia_linux.go
View file

@ -8,7 +8,7 @@ import (
"github.com/containerd/containerd/contrib/nvidia" "github.com/containerd/containerd/contrib/nvidia"
"github.com/docker/docker/pkg/capabilities" "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" "github.com/pkg/errors"
) )

2
daemon/oci_linux.go
View file

@ -27,7 +27,7 @@ import (
"github.com/opencontainers/runc/libcontainer/devices" "github.com/opencontainers/runc/libcontainer/devices"
rsystem "github.com/opencontainers/runc/libcontainer/system" rsystem "github.com/opencontainers/runc/libcontainer/system"
"github.com/opencontainers/runc/libcontainer/user" "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/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
daemon/oci_utils.go
View file

@ -2,7 +2,7 @@ package daemon // import "github.com/docker/docker/daemon"
import ( import (
"github.com/docker/docker/container" "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) { func setLinuxDomainname(c *container.Container, s *specs.Spec) {

2
daemon/oci_windows.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/docker/oci/caps" "github.com/docker/docker/oci/caps"
"github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/sysinfo"
"github.com/docker/docker/pkg/system" "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/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/registry"

2
daemon/oci_windows_test.go
View file

@ -14,7 +14,7 @@ import (
"github.com/docker/docker/container" "github.com/docker/docker/container"
swarmagent "github.com/docker/swarmkit/agent" swarmagent "github.com/docker/swarmkit/agent"
swarmapi "github.com/docker/swarmkit/api" 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" "golang.org/x/sys/windows/registry"
"gotest.tools/assert" "gotest.tools/assert"
) )

2
daemon/seccomp_linux.go
View file

@ -10,7 +10,7 @@ import (
coci "github.com/containerd/containerd/oci" coci "github.com/containerd/containerd/oci"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/profiles/seccomp" "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" "github.com/sirupsen/logrus"
) )

2
daemon/selinux_linux.go
View file

@ -1,6 +1,6 @@
package daemon // import "github.com/docker/docker/daemon" 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() { func selinuxSetDisabled() {
selinux.SetDisabled() selinux.SetDisabled()

2
daemon/top_windows.go
View file

@ -7,7 +7,7 @@ import (
"time" "time"
containertypes "github.com/docker/docker/api/types/container" 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. // ContainerTop handles `docker top` client requests.

2
daemon/update_linux.go
View file

@ -5,7 +5,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
libcontainerdtypes "github.com/docker/docker/libcontainerd/types" 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 { func toContainerdResources(resources container.Resources) *libcontainerdtypes.Resources {

2
distribution/config.go
View file

@ -19,7 +19,7 @@ import (
refstore "github.com/docker/docker/reference" refstore "github.com/docker/docker/reference"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
distribution/errors.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/distribution" "github.com/docker/distribution"
"github.com/docker/distribution/reference" "github.com/docker/distribution/reference"
"github.com/docker/distribution/registry/api/errcode" "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"
"github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/auth"
"github.com/docker/docker/distribution/xfer" "github.com/docker/docker/distribution/xfer"

2
distribution/errors_test.go
View file

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/docker/distribution/registry/api/errcode" "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"
) )

2
distribution/metadata/v1_id_service.go
View file

@ -1,7 +1,7 @@
package metadata // import "github.com/docker/docker/distribution/metadata" package metadata // import "github.com/docker/docker/distribution/metadata"
import ( import (
"github.com/docker/docker/image/v1" v1 "github.com/docker/docker/image/v1"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
distribution/metadata/v2_metadata_service.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/layer" "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 // V2MetadataService maps layer IDs to a set of known metadata for

2
distribution/metadata/v2_metadata_service_test.go
View file

@ -9,7 +9,7 @@ import (
"testing" "testing"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
func TestV2MetadataService(t *testing.T) { func TestV2MetadataService(t *testing.T) {

2
distribution/pull.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
refstore "github.com/docker/docker/reference" refstore "github.com/docker/docker/reference"
"github.com/docker/docker/registry" "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" specs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
distribution/pull_v2.go
View file

@ -31,7 +31,7 @@ import (
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
refstore "github.com/docker/docker/reference" refstore "github.com/docker/docker/reference"
"github.com/docker/docker/registry" "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" specs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

2
distribution/pull_v2_test.go
View file

@ -12,7 +12,7 @@ import (
"github.com/docker/distribution/manifest/schema1" "github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/reference" "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" specs "github.com/opencontainers/image-spec/specs-go/v1"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"

2
distribution/push_v2.go
View file

@ -24,7 +24,7 @@ import (
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
distribution/push_v2_test.go
View file

@ -17,7 +17,7 @@ import (
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
refstore "github.com/docker/docker/reference" refstore "github.com/docker/docker/reference"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
func TestGetRepositoryMountCandidates(t *testing.T) { func TestGetRepositoryMountCandidates(t *testing.T) {

2
distribution/xfer/download_test.go
View file

@ -16,7 +16,7 @@ import (
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
const maxDownloadConcurrency = 3 const maxDownloadConcurrency = 3

2
image/fs.go
View file

@ -8,7 +8,7 @@ import (
"sync" "sync"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
image/fs_test.go
View file

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
) )

2
image/image.go
View file

@ -11,7 +11,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/layer" "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. // ID is the content-addressable ID of an image.

2
image/store.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/distribution/digestset" "github.com/docker/distribution/digestset"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
image/store_test.go
View file

@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
"gotest.tools/assert/cmp" "gotest.tools/assert/cmp"
) )

4
image/tarexport/load.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/distribution" "github.com/docker/distribution"
"github.com/docker/distribution/reference" "github.com/docker/distribution/reference"
"github.com/docker/docker/image" "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/layer"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/chrootarchive" "github.com/docker/docker/pkg/chrootarchive"
@ -24,7 +24,7 @@ import (
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/symlink"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

4
image/tarexport/save.go
View file

@ -14,11 +14,11 @@ import (
"github.com/docker/distribution" "github.com/docker/distribution"
"github.com/docker/distribution/reference" "github.com/docker/distribution/reference"
"github.com/docker/docker/image" "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/layer"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
image/v1/imagev1.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
integration-cli/docker_cli_build_test.go
View file

@ -26,7 +26,7 @@ import (
"github.com/docker/docker/testutil/fakegit" "github.com/docker/docker/testutil/fakegit"
"github.com/docker/docker/testutil/fakestorage" "github.com/docker/docker/testutil/fakestorage"
"github.com/moby/buildkit/frontend/dockerfile/command" "github.com/moby/buildkit/frontend/dockerfile/command"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
"gotest.tools/assert/cmp" "gotest.tools/assert/cmp"
"gotest.tools/icmd" "gotest.tools/icmd"

2
integration-cli/docker_cli_build_unix_test.go
View file

@ -19,7 +19,7 @@ import (
"github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/cli/build"
"github.com/docker/docker/testutil/fakecontext" "github.com/docker/docker/testutil/fakecontext"
"github.com/docker/go-units" units "github.com/docker/go-units"
"gotest.tools/assert" "gotest.tools/assert"
"gotest.tools/icmd" "gotest.tools/icmd"
) )

2
integration-cli/docker_cli_by_digest_test.go
View file

@ -14,7 +14,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/cli/build"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
) )

2
integration-cli/docker_cli_daemon_test.go
View file

@ -34,7 +34,7 @@ import (
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
testdaemon "github.com/docker/docker/testutil/daemon" 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/libnetwork/iptables"
"github.com/docker/libtrust" "github.com/docker/libtrust"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
integration-cli/docker_cli_pull_local_test.go
View file

@ -15,7 +15,7 @@ import (
"github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema2" "github.com/docker/distribution/manifest/schema2"
"github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/cli/build"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
"gotest.tools/icmd" "gotest.tools/icmd"
) )

2
integration-cli/docker_cli_pull_test.go
View file

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
) )

2
integration-cli/docker_cli_save_load_test.go
View file

@ -17,7 +17,7 @@ import (
"time" "time"
"github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/cli/build"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
"gotest.tools/icmd" "gotest.tools/icmd"

2
layer/empty_test.go
View file

@ -4,7 +4,7 @@ import (
"io" "io"
"testing" "testing"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
func TestEmptyLayer(t *testing.T) { func TestEmptyLayer(t *testing.T) {

2
layer/filestore_test.go
View file

@ -11,7 +11,7 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
func randomLayerID(seed int64) ChainID { func randomLayerID(seed int64) ChainID {

2
layer/layer.go
View file

@ -16,7 +16,7 @@ import (
"github.com/docker/distribution" "github.com/docker/distribution"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/containerfs"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
layer/layer_store.go
View file

@ -16,7 +16,7 @@ import (
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/asm"
"github.com/vbatts/tar-split/tar/storage" "github.com/vbatts/tar-split/tar/storage"

2
layer/layer_test.go
View file

@ -17,7 +17,7 @@ import (
"github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
func init() { func init() {

2
layer/migration.go
View file

@ -6,7 +6,7 @@ import (
"io" "io"
"os" "os"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/asm"
"github.com/vbatts/tar-split/tar/storage" "github.com/vbatts/tar-split/tar/storage"

2
layer/ro_layer.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"github.com/docker/distribution" "github.com/docker/distribution"
"github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )
type roLayer struct { type roLayer struct {

2
libcontainerd/remote/client_linux.go
View file

@ -12,7 +12,7 @@ import (
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
libcontainerdtypes "github.com/docker/docker/libcontainerd/types" libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
"github.com/docker/docker/pkg/idtools" "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" "github.com/sirupsen/logrus"
) )

2
libcontainerd/types/types.go
View file

@ -6,7 +6,7 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio" "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 // EventType represents a possible event from libcontainerd

2
libcontainerd/types/types_linux.go
View file

@ -4,7 +4,7 @@ import (
"time" "time"
"github.com/containerd/cgroups" "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 // Summary is not used on linux

2
oci/defaults.go
View file

@ -4,7 +4,7 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
) )
func iPtr(i int64) *int64 { return &i } func iPtr(i int64) *int64 { return &i }

2
oci/devices_linux.go
View file

@ -8,7 +8,7 @@ import (
"github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/devices" "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. // Device transforms a libcontainer configs.Device to a specs.LinuxDevice object.

2
oci/namespaces.go
View file

@ -1,6 +1,6 @@
package oci // import "github.com/docker/docker/oci" 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` // RemoveNamespace removes the `nsType` namespace from OCI spec `s`
func RemoveNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) { func RemoveNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) {

2
opts/opts.go
View file

@ -7,7 +7,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/docker/go-units" units "github.com/docker/go-units"
) )
var ( var (

2
opts/ulimit.go
View file

@ -3,7 +3,7 @@ package opts // import "github.com/docker/docker/opts"
import ( import (
"fmt" "fmt"
"github.com/docker/go-units" units "github.com/docker/go-units"
) )
// UlimitOpt defines a map of Ulimits // UlimitOpt defines a map of Ulimits

2
opts/ulimit_test.go
View file

@ -3,7 +3,7 @@ package opts // import "github.com/docker/docker/opts"
import ( import (
"testing" "testing"
"github.com/docker/go-units" units "github.com/docker/go-units"
) )
func TestUlimitOpt(t *testing.T) { func TestUlimitOpt(t *testing.T) {

2
pkg/jsonmessage/jsonmessage.go
View file

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/docker/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/docker/go-units" units "github.com/docker/go-units"
"github.com/morikuni/aec" "github.com/morikuni/aec"
) )

Some files were not shown because too many files have changed in this diff Show more