diff --git a/daemon/container.go b/daemon/container.go index b4a33e3e18..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/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 b990b0df60..7aa308782f 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -26,10 +26,10 @@ import ( "github.com/dotcloud/docker/graph" "github.com/dotcloud/docker/image" "github.com/dotcloud/docker/pkg/graphdb" - "github.com/dotcloud/docker/pkg/label" + "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/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 8f785e8a8f..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/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/lxc/init.go b/daemon/execdriver/lxc/init.go index 5e77190e5a..21e663a460 100644 --- a/daemon/execdriver/lxc/init.go +++ b/daemon/execdriver/lxc/init.go @@ -10,7 +10,7 @@ import ( "syscall" "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/netlink" + "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 fcebe134e7..060ac6b6be 100644 --- a/daemon/execdriver/lxc/lxc_template.go +++ b/daemon/execdriver/lxc/lxc_template.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/label" + "github.com/dotcloud/docker/pkg/libcontainer/label" ) const LxcTemplate = ` diff --git a/daemon/execdriver/native/create.go b/daemon/execdriver/native/create.go index 9de500dbe5..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/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 d3805b493c..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/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 3488b2084e..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/apparmor" "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/cgroups" ) diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index 97e9b9748a..cd609325e6 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -32,7 +32,7 @@ import ( "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/label" + "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 48323f6610..3b573eb4d1 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -19,7 +19,7 @@ import ( "time" "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/label" + "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 a960aead61..958c5693bb 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -14,7 +14,7 @@ import ( "github.com/dotcloud/docker/daemon/networkdriver/portmapper" "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/pkg/iptables" - "github.com/dotcloud/docker/pkg/netlink" + "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 6224c2dffb..b601ee92b4 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/netlink" + "github.com/dotcloud/docker/pkg/libcontainer/netlink" "net" "testing" ) diff --git a/daemon/networkdriver/utils.go b/daemon/networkdriver/utils.go index 0a4ef70c95..0491fcd565 100644 --- a/daemon/networkdriver/utils.go +++ b/daemon/networkdriver/utils.go @@ -6,7 +6,7 @@ import ( "fmt" "net" - "github.com/dotcloud/docker/pkg/netlink" + "github.com/dotcloud/docker/pkg/libcontainer/netlink" ) var ( diff --git a/pkg/apparmor/apparmor.go b/pkg/libcontainer/apparmor/apparmor.go similarity index 100% rename from pkg/apparmor/apparmor.go rename to pkg/libcontainer/apparmor/apparmor.go diff --git a/pkg/apparmor/apparmor_disabled.go b/pkg/libcontainer/apparmor/apparmor_disabled.go similarity index 100% rename from pkg/apparmor/apparmor_disabled.go rename to pkg/libcontainer/apparmor/apparmor_disabled.go diff --git a/pkg/apparmor/gen.go b/pkg/libcontainer/apparmor/gen.go similarity index 100% rename from pkg/apparmor/gen.go rename to pkg/libcontainer/apparmor/gen.go diff --git a/pkg/apparmor/setup.go b/pkg/libcontainer/apparmor/setup.go similarity index 100% rename from pkg/apparmor/setup.go rename to pkg/libcontainer/apparmor/setup.go diff --git a/pkg/libcontainer/console/console.go b/pkg/libcontainer/console/console.go index 79a480418f..ccab528105 100644 --- a/pkg/libcontainer/console/console.go +++ b/pkg/libcontainer/console/console.go @@ -8,7 +8,7 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/label" + "github.com/dotcloud/docker/pkg/libcontainer/label" "github.com/dotcloud/docker/pkg/system" ) diff --git a/pkg/label/label.go b/pkg/libcontainer/label/label.go similarity index 100% rename from pkg/label/label.go rename to pkg/libcontainer/label/label.go diff --git a/pkg/label/label_selinux.go b/pkg/libcontainer/label/label_selinux.go similarity index 96% rename from pkg/label/label_selinux.go rename to pkg/libcontainer/label/label_selinux.go index 926f7fffa8..1ef8891e5c 100644 --- a/pkg/label/label_selinux.go +++ b/pkg/libcontainer/label/label_selinux.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/dotcloud/docker/pkg/selinux" + "github.com/dotcloud/docker/pkg/libcontainer/selinux" ) func GenLabels(options string) (string, string, error) { diff --git a/pkg/libcontainer/mount/init.go b/pkg/libcontainer/mount/init.go index af7a521c46..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/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 4d5671e778..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/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 b53c56668d..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/apparmor" - "github.com/dotcloud/docker/pkg/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/netlink" "github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/user" ) diff --git a/pkg/netlink/MAINTAINERS b/pkg/libcontainer/netlink/MAINTAINERS similarity index 100% rename from pkg/netlink/MAINTAINERS rename to pkg/libcontainer/netlink/MAINTAINERS diff --git a/pkg/netlink/netlink.go b/pkg/libcontainer/netlink/netlink.go similarity index 100% rename from pkg/netlink/netlink.go rename to pkg/libcontainer/netlink/netlink.go diff --git a/pkg/netlink/netlink_linux.go b/pkg/libcontainer/netlink/netlink_linux.go similarity index 100% rename from pkg/netlink/netlink_linux.go rename to pkg/libcontainer/netlink/netlink_linux.go diff --git a/pkg/netlink/netlink_unsupported.go b/pkg/libcontainer/netlink/netlink_unsupported.go similarity index 100% rename from pkg/netlink/netlink_unsupported.go rename to pkg/libcontainer/netlink/netlink_unsupported.go diff --git a/pkg/libcontainer/network/network.go b/pkg/libcontainer/network/network.go index 85a28dc37c..75d0040135 100644 --- a/pkg/libcontainer/network/network.go +++ b/pkg/libcontainer/network/network.go @@ -1,7 +1,7 @@ package network import ( - "github.com/dotcloud/docker/pkg/netlink" + "github.com/dotcloud/docker/pkg/libcontainer/netlink" "net" ) diff --git a/pkg/selinux/selinux.go b/pkg/libcontainer/selinux/selinux.go similarity index 100% rename from pkg/selinux/selinux.go rename to pkg/libcontainer/selinux/selinux.go diff --git a/pkg/selinux/selinux_test.go b/pkg/libcontainer/selinux/selinux_test.go similarity index 96% rename from pkg/selinux/selinux_test.go rename to pkg/libcontainer/selinux/selinux_test.go index 9a3a5525e4..0e900c1dfe 100644 --- a/pkg/selinux/selinux_test.go +++ b/pkg/libcontainer/selinux/selinux_test.go @@ -1,7 +1,7 @@ package selinux_test import ( - "github.com/dotcloud/docker/pkg/selinux" + "github.com/dotcloud/docker/pkg/libcontainer/selinux" "os" "testing" )