diff --git a/daemon/container.go b/daemon/container.go index e80c661eef..fad6103c75 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -15,8 +15,6 @@ import ( "syscall" "time" - "github.com/docker/libcontainer/devices" - "github.com/docker/libcontainer/label" "github.com/docker/docker/archive" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/graphdriver" @@ -30,6 +28,8 @@ import ( "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" "github.com/docker/docker/utils/broadcastwriter" + "github.com/docker/libcontainer/devices" + "github.com/docker/libcontainer/label" ) const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/daemon/daemon.go b/daemon/daemon.go index 646af18e04..5703269431 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -12,7 +12,6 @@ import ( "sync" "time" - "github.com/docker/libcontainer/label" "github.com/docker/docker/archive" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver/execdrivers" @@ -34,6 +33,7 @@ import ( "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" "github.com/docker/docker/utils/broadcastwriter" + "github.com/docker/libcontainer/label" ) // Set the max depth to the aufs default that most diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index ffe7833a05..c795d54443 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/daemon/execdriver/lxc/driver.go @@ -16,12 +16,12 @@ import ( "syscall" "time" - "github.com/docker/libcontainer/cgroups" - "github.com/docker/libcontainer/label" - "github.com/docker/libcontainer/mount/nodes" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/pkg/term" "github.com/docker/docker/utils" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/mount/nodes" "github.com/kr/pty" ) diff --git a/daemon/execdriver/lxc/init.go b/daemon/execdriver/lxc/init.go index 45ad1d1bc0..246c56f0c1 100644 --- a/daemon/execdriver/lxc/init.go +++ b/daemon/execdriver/lxc/init.go @@ -9,8 +9,8 @@ import ( "strings" "syscall" - "github.com/docker/libcontainer/netlink" "github.com/docker/docker/daemon/execdriver" + "github.com/docker/libcontainer/netlink" ) // Clear environment pollution introduced by lxc-start diff --git a/daemon/execdriver/lxc/lxc_init_linux.go b/daemon/execdriver/lxc/lxc_init_linux.go index 1d0b395217..dac8bb273f 100644 --- a/daemon/execdriver/lxc/lxc_init_linux.go +++ b/daemon/execdriver/lxc/lxc_init_linux.go @@ -7,12 +7,12 @@ import ( "strings" "syscall" - "github.com/docker/libcontainer/namespaces" - "github.com/docker/libcontainer/security/capabilities" - "github.com/docker/libcontainer/utils" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver/native/template" "github.com/docker/docker/pkg/system" + "github.com/docker/libcontainer/namespaces" + "github.com/docker/libcontainer/security/capabilities" + "github.com/docker/libcontainer/utils" ) func setHostname(hostname string) error { diff --git a/daemon/execdriver/lxc/lxc_template.go b/daemon/execdriver/lxc/lxc_template.go index c831564b87..08b3e7c82b 100644 --- a/daemon/execdriver/lxc/lxc_template.go +++ b/daemon/execdriver/lxc/lxc_template.go @@ -4,8 +4,8 @@ import ( "strings" "text/template" - "github.com/docker/libcontainer/label" "github.com/docker/docker/daemon/execdriver" + "github.com/docker/libcontainer/label" ) const LxcTemplate = ` diff --git a/daemon/execdriver/lxc/lxc_template_unit_test.go b/daemon/execdriver/lxc/lxc_template_unit_test.go index a7c2bf682e..8acda804ee 100644 --- a/daemon/execdriver/lxc/lxc_template_unit_test.go +++ b/daemon/execdriver/lxc/lxc_template_unit_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/docker/libcontainer/devices" "github.com/docker/docker/daemon/execdriver" + "github.com/docker/libcontainer/devices" ) func TestLXCConfig(t *testing.T) { diff --git a/daemon/execdriver/native/configuration/parse.go b/daemon/execdriver/native/configuration/parse.go index 7aba4820ab..e021fa0de4 100644 --- a/daemon/execdriver/native/configuration/parse.go +++ b/daemon/execdriver/native/configuration/parse.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/docker/libcontainer" "github.com/docker/docker/pkg/units" + "github.com/docker/libcontainer" ) type Action func(*libcontainer.Config, interface{}, string) error diff --git a/daemon/execdriver/native/configuration/parse_test.go b/daemon/execdriver/native/configuration/parse_test.go index 8b1d275aed..1493d2b29b 100644 --- a/daemon/execdriver/native/configuration/parse_test.go +++ b/daemon/execdriver/native/configuration/parse_test.go @@ -3,8 +3,8 @@ package configuration import ( "testing" - "github.com/docker/libcontainer/security/capabilities" "github.com/docker/docker/daemon/execdriver/native/template" + "github.com/docker/libcontainer/security/capabilities" ) // Checks whether the expected capability is specified in the capabilities. diff --git a/daemon/execdriver/native/create.go b/daemon/execdriver/native/create.go index e602e49a06..e475a1f2ad 100644 --- a/daemon/execdriver/native/create.go +++ b/daemon/execdriver/native/create.go @@ -8,14 +8,14 @@ import ( "os/exec" "path/filepath" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver/native/configuration" + "github.com/docker/docker/daemon/execdriver/native/template" "github.com/docker/libcontainer" "github.com/docker/libcontainer/apparmor" "github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/mount" "github.com/docker/libcontainer/security/capabilities" - "github.com/docker/docker/daemon/execdriver" - "github.com/docker/docker/daemon/execdriver/native/configuration" - "github.com/docker/docker/daemon/execdriver/native/template" ) // createContainer populates and configures the container type with the diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 5ffc6a4488..51767a99d6 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -14,15 +14,15 @@ import ( "sync" "syscall" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/pkg/system" + "github.com/docker/docker/pkg/term" "github.com/docker/libcontainer" "github.com/docker/libcontainer/apparmor" "github.com/docker/libcontainer/cgroups/fs" "github.com/docker/libcontainer/cgroups/systemd" "github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/syncpipe" - "github.com/docker/docker/daemon/execdriver" - "github.com/docker/docker/pkg/system" - "github.com/docker/docker/pkg/term" ) const ( diff --git a/daemon/execdriver/utils.go b/daemon/execdriver/utils.go index c1317fb833..c2526e1b9b 100644 --- a/daemon/execdriver/utils.go +++ b/daemon/execdriver/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/docker/libcontainer/security/capabilities" "github.com/docker/docker/utils" + "github.com/docker/libcontainer/security/capabilities" ) func TweakCapabilities(basics, adds, drops []string) ([]string, error) { diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index d1fa91d6d4..91eeb95e8d 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -30,11 +30,11 @@ import ( "sync" "syscall" - "github.com/docker/libcontainer/label" "github.com/docker/docker/archive" "github.com/docker/docker/daemon/graphdriver" mountpk "github.com/docker/docker/pkg/mount" "github.com/docker/docker/utils" + "github.com/docker/libcontainer/label" ) var ( diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 518bef2180..bbe034b148 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -18,10 +18,10 @@ import ( "syscall" "time" - "github.com/docker/libcontainer/label" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/units" "github.com/docker/docker/utils" + "github.com/docker/libcontainer/label" ) var ( diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index caedb7202a..d66ba67127 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -8,7 +8,6 @@ import ( "strings" "sync" - "github.com/docker/libcontainer/netlink" "github.com/docker/docker/daemon/networkdriver" "github.com/docker/docker/daemon/networkdriver/ipallocator" "github.com/docker/docker/daemon/networkdriver/portallocator" @@ -17,6 +16,7 @@ import ( "github.com/docker/docker/pkg/iptables" "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/utils" + "github.com/docker/libcontainer/netlink" ) const (