diff --git a/daemon/container.go b/daemon/container.go index 899b7b9b34..7eac1a75e3 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -22,8 +22,8 @@ import ( "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/links" "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/networkfs/etchosts" "github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/dotcloud/docker/pkg/symlink" diff --git a/daemon/daemon.go b/daemon/daemon.go index 73b21181ea..7aa308782f 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -27,9 +27,9 @@ import ( "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/pkg/graphdb" "github.com/dotcloud/docker/pkg/libcontainer/label" + "github.com/dotcloud/docker/pkg/libcontainer/selinux" "github.com/dotcloud/docker/pkg/namesgenerator" "github.com/dotcloud/docker/pkg/networkfs/resolvconf" - "github.com/dotcloud/docker/pkg/libcontainer/selinux" "github.com/dotcloud/docker/pkg/sysinfo" "github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/utils" diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index 04d2f516c2..f4583586a6 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/daemon/execdriver/lxc/driver.go @@ -16,8 +16,8 @@ import ( "time" "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" "github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/utils" diff --git a/daemon/execdriver/native/create.go b/daemon/execdriver/native/create.go index 6409ed443b..9237b630b5 100644 --- a/daemon/execdriver/native/create.go +++ b/daemon/execdriver/native/create.go @@ -9,8 +9,8 @@ import ( "github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/execdriver/native/configuration" "github.com/dotcloud/docker/daemon/execdriver/native/template" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/devices" ) diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 3462ba6b95..9a00c4e84c 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -12,8 +12,8 @@ import ( "syscall" "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd" "github.com/dotcloud/docker/pkg/libcontainer/namespaces" diff --git a/daemon/execdriver/native/template/default_template.go b/daemon/execdriver/native/template/default_template.go index cb66eb097f..46329bd71c 100644 --- a/daemon/execdriver/native/template/default_template.go +++ b/daemon/execdriver/native/template/default_template.go @@ -1,8 +1,8 @@ package template import ( - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/cgroups" ) diff --git a/pkg/libcontainer/mount/init.go b/pkg/libcontainer/mount/init.go index e7bf1fdd5a..0338fe7caf 100644 --- a/pkg/libcontainer/mount/init.go +++ b/pkg/libcontainer/mount/init.go @@ -8,8 +8,8 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" "github.com/dotcloud/docker/pkg/symlink" "github.com/dotcloud/docker/pkg/system" diff --git a/pkg/libcontainer/namespaces/execin.go b/pkg/libcontainer/namespaces/execin.go index deacec39ea..e4f07ae1e7 100644 --- a/pkg/libcontainer/namespaces/execin.go +++ b/pkg/libcontainer/namespaces/execin.go @@ -7,8 +7,8 @@ import ( "os" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/libcontainer/namespaces/init.go b/pkg/libcontainer/namespaces/init.go index 3dc82f200d..27cd9bfdc8 100644 --- a/pkg/libcontainer/namespaces/init.go +++ b/pkg/libcontainer/namespaces/init.go @@ -9,16 +9,16 @@ import ( "strings" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" - "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/console" + "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/libcontainer/mount" + "github.com/dotcloud/docker/pkg/libcontainer/netlink" "github.com/dotcloud/docker/pkg/libcontainer/network" "github.com/dotcloud/docker/pkg/libcontainer/security/capabilities" "github.com/dotcloud/docker/pkg/libcontainer/security/restrict" "github.com/dotcloud/docker/pkg/libcontainer/utils" - "github.com/dotcloud/docker/pkg/libcontainer/netlink" "github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/user" )