diff --git a/daemon/container.go b/daemon/container.go index 7eac1a75e3..f7d2ef1f5f 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -15,6 +15,8 @@ import ( "syscall" "time" + "github.com/docker/libcontainer/devices" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/graphdriver" @@ -22,8 +24,6 @@ import ( "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/links" "github.com/dotcloud/docker/nat" - "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 7aa308782f..51852749f4 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -12,6 +12,8 @@ import ( "sync" "time" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/selinux" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/execdriver/execdrivers" @@ -26,8 +28,6 @@ import ( "github.com/dotcloud/docker/graph" "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/sysinfo" diff --git a/daemon/execdriver/driver.go b/daemon/execdriver/driver.go index a5c5c814d7..a3d3bc260a 100644 --- a/daemon/execdriver/driver.go +++ b/daemon/execdriver/driver.go @@ -6,7 +6,7 @@ import ( "os" "os/exec" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/devices" ) // Context is a generic key value pair that allows diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index f4583586a6..118eab1987 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/daemon/execdriver/lxc/driver.go @@ -15,10 +15,10 @@ import ( "syscall" "time" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/mount/nodes" "github.com/dotcloud/docker/daemon/execdriver" - "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/lxc/init.go b/daemon/execdriver/lxc/init.go index 21e663a460..e687a9db4d 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/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/libcontainer/netlink" "github.com/dotcloud/docker/pkg/user" "github.com/syndtr/gocapability/capability" ) diff --git a/daemon/execdriver/lxc/lxc_template.go b/daemon/execdriver/lxc/lxc_template.go index 060ac6b6be..88618f07fd 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/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/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 12760adb7a..a9a67c421c 100644 --- a/daemon/execdriver/lxc/lxc_template_unit_test.go +++ b/daemon/execdriver/lxc/lxc_template_unit_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" + "github.com/docker/libcontainer/devices" "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/libcontainer/devices" ) func TestLXCConfig(t *testing.T) { diff --git a/daemon/execdriver/native/configuration/parse.go b/daemon/execdriver/native/configuration/parse.go index f18a60f797..77d4b297cb 100644 --- a/daemon/execdriver/native/configuration/parse.go +++ b/daemon/execdriver/native/configuration/parse.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" "github.com/dotcloud/docker/pkg/units" ) diff --git a/daemon/execdriver/native/configuration/parse_test.go b/daemon/execdriver/native/configuration/parse_test.go index 5524adb857..c561f5e2d3 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" "github.com/dotcloud/docker/daemon/execdriver/native/template" - "github.com/dotcloud/docker/pkg/libcontainer" ) // 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 9237b630b5..b19620514e 100644 --- a/daemon/execdriver/native/create.go +++ b/daemon/execdriver/native/create.go @@ -6,12 +6,12 @@ import ( "os/exec" "path/filepath" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/apparmor" + "github.com/docker/libcontainer/devices" "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" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" - "github.com/dotcloud/docker/pkg/libcontainer/devices" ) // createContainer populates and configures the container type with the diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 9a00c4e84c..840d9fbc41 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -11,12 +11,12 @@ import ( "sync" "syscall" + "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/dotcloud/docker/daemon/execdriver" - "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" "github.com/dotcloud/docker/pkg/system" ) diff --git a/daemon/execdriver/native/template/default_template.go b/daemon/execdriver/native/template/default_template.go index 46329bd71c..e2f52f4445 100644 --- a/daemon/execdriver/native/template/default_template.go +++ b/daemon/execdriver/native/template/default_template.go @@ -1,9 +1,9 @@ package template import ( - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/apparmor" + "github.com/docker/libcontainer/cgroups" ) // New returns the docker default configuration for libcontainer diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index cd609325e6..eb8ff77cde 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -30,9 +30,9 @@ import ( "sync" "syscall" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/libcontainer/label" mountpk "github.com/dotcloud/docker/pkg/mount" "github.com/dotcloud/docker/utils" ) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 3b573eb4d1..c7e4857394 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -18,8 +18,8 @@ import ( "syscall" "time" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/units" "github.com/dotcloud/docker/utils" ) diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index 958c5693bb..8c5db9f843 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -8,13 +8,13 @@ import ( "strings" "sync" + "github.com/docker/libcontainer/netlink" "github.com/dotcloud/docker/daemon/networkdriver" "github.com/dotcloud/docker/daemon/networkdriver/ipallocator" "github.com/dotcloud/docker/daemon/networkdriver/portallocator" "github.com/dotcloud/docker/daemon/networkdriver/portmapper" "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/pkg/iptables" - "github.com/dotcloud/docker/pkg/libcontainer/netlink" "github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/dotcloud/docker/utils" ) diff --git a/daemon/networkdriver/network_test.go b/daemon/networkdriver/network_test.go index b601ee92b4..d655cb30e4 100644 --- a/daemon/networkdriver/network_test.go +++ b/daemon/networkdriver/network_test.go @@ -1,7 +1,7 @@ package networkdriver import ( - "github.com/dotcloud/docker/pkg/libcontainer/netlink" + "github.com/docker/libcontainer/netlink" "net" "testing" ) diff --git a/daemon/networkdriver/utils.go b/daemon/networkdriver/utils.go index 0491fcd565..410d6010c4 100644 --- a/daemon/networkdriver/utils.go +++ b/daemon/networkdriver/utils.go @@ -6,7 +6,7 @@ import ( "fmt" "net" - "github.com/dotcloud/docker/pkg/libcontainer/netlink" + "github.com/docker/libcontainer/netlink" ) var ( diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go index bdc192b913..0c28719f61 100644 --- a/pkg/sysinfo/sysinfo.go +++ b/pkg/sysinfo/sysinfo.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type SysInfo struct {