kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Move libcontainer deps into libcontainer 

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-06-09 15:52:12 -07:00
parent fd32fc8062
commit 6158ccad97
30 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/container.go
View File

@ -22,7 +22,7 @@ import (
"github.com/dotcloud/docker/image" "github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/links" "github.com/dotcloud/docker/links"
"github.com/dotcloud/docker/nat" "github.com/dotcloud/docker/nat"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer/devices" "github.com/dotcloud/docker/pkg/libcontainer/devices"
"github.com/dotcloud/docker/pkg/networkfs/etchosts" "github.com/dotcloud/docker/pkg/networkfs/etchosts"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/dotcloud/docker/pkg/networkfs/resolvconf"

4
daemon/daemon.go
View File

@ -26,10 +26,10 @@ import (
"github.com/dotcloud/docker/graph" "github.com/dotcloud/docker/graph"
"github.com/dotcloud/docker/image" "github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/pkg/graphdb" "github.com/dotcloud/docker/pkg/graphdb"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/namesgenerator" "github.com/dotcloud/docker/pkg/namesgenerator"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/dotcloud/docker/pkg/networkfs/resolvconf"
"github.com/dotcloud/docker/pkg/selinux" "github.com/dotcloud/docker/pkg/libcontainer/selinux"
"github.com/dotcloud/docker/pkg/sysinfo" "github.com/dotcloud/docker/pkg/sysinfo"
"github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/runconfig"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"

2
daemon/execdriver/lxc/driver.go
View File

@ -16,7 +16,7 @@ import (
"time" "time"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"

2
daemon/execdriver/lxc/init.go
View File

@ -10,7 +10,7 @@ import (
"syscall" "syscall"
"github.com/dotcloud/docker/daemon/execdriver" "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/dotcloud/docker/pkg/user"
"github.com/syndtr/gocapability/capability" "github.com/syndtr/gocapability/capability"
) )

2
daemon/execdriver/lxc/lxc_template.go
View File

@ -5,7 +5,7 @@ import (
"text/template" "text/template"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
) )
const LxcTemplate = ` const LxcTemplate = `

2
daemon/execdriver/native/create.go
View File

@ -9,7 +9,7 @@ import (
"github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/native/configuration" "github.com/dotcloud/docker/daemon/execdriver/native/configuration"
"github.com/dotcloud/docker/daemon/execdriver/native/template" "github.com/dotcloud/docker/daemon/execdriver/native/template"
"github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/devices" "github.com/dotcloud/docker/pkg/libcontainer/devices"
) )

2
daemon/execdriver/native/driver.go
View File

@ -12,7 +12,7 @@ import (
"syscall" "syscall"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"

2
daemon/execdriver/native/template/default_template.go
View File

@ -1,7 +1,7 @@
package template package template
import ( import (
"github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups" "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
) )

2
daemon/graphdriver/aufs/aufs.go
View File

@ -32,7 +32,7 @@ import (
"github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/daemon/graphdriver" "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" mountpk "github.com/dotcloud/docker/pkg/mount"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
) )

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

@ -19,7 +19,7 @@ import (
"time" "time"
"github.com/dotcloud/docker/daemon/graphdriver" "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/pkg/units"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
) )

2
daemon/networkdriver/bridge/driver.go
View File

@ -14,7 +14,7 @@ import (
"github.com/dotcloud/docker/daemon/networkdriver/portmapper" "github.com/dotcloud/docker/daemon/networkdriver/portmapper"
"github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/pkg/iptables" "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/pkg/networkfs/resolvconf"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
) )

2
daemon/networkdriver/network_test.go
View File

@ -1,7 +1,7 @@
package networkdriver package networkdriver
import ( import (
"github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/pkg/libcontainer/netlink"
"net" "net"
"testing" "testing"
) )

2
daemon/networkdriver/utils.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"net" "net"
"github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/pkg/libcontainer/netlink"
) )
var ( var (

0
pkg/apparmor/apparmor.go → pkg/libcontainer/apparmor/apparmor.go
View File

0
pkg/apparmor/apparmor_disabled.go → pkg/libcontainer/apparmor/apparmor_disabled.go
View File

0
pkg/apparmor/gen.go → pkg/libcontainer/apparmor/gen.go
View File

0
pkg/apparmor/setup.go → pkg/libcontainer/apparmor/setup.go
View File

2
pkg/libcontainer/console/console.go
View File

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
) )

0
pkg/label/label.go → pkg/libcontainer/label/label.go
View File

2
pkg/label/label_selinux.go → pkg/libcontainer/label/label_selinux.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/dotcloud/docker/pkg/selinux" "github.com/dotcloud/docker/pkg/libcontainer/selinux"
) )
func GenLabels(options string) (string, string, error) { func GenLabels(options string) (string, string, error) {

2
pkg/libcontainer/mount/init.go
View File

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes"
"github.com/dotcloud/docker/pkg/symlink" "github.com/dotcloud/docker/pkg/symlink"

2
pkg/libcontainer/namespaces/execin.go
View File

@ -7,7 +7,7 @@ import (
"os" "os"
"strconv" "strconv"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
) )

6
pkg/libcontainer/namespaces/init.go
View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/apparmor"
"github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/console" "github.com/dotcloud/docker/pkg/libcontainer/console"
"github.com/dotcloud/docker/pkg/libcontainer/mount" "github.com/dotcloud/docker/pkg/libcontainer/mount"
@ -18,7 +18,7 @@ import (
"github.com/dotcloud/docker/pkg/libcontainer/security/capabilities" "github.com/dotcloud/docker/pkg/libcontainer/security/capabilities"
"github.com/dotcloud/docker/pkg/libcontainer/security/restrict" "github.com/dotcloud/docker/pkg/libcontainer/security/restrict"
"github.com/dotcloud/docker/pkg/libcontainer/utils" "github.com/dotcloud/docker/pkg/libcontainer/utils"
"github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/pkg/libcontainer/netlink"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/pkg/user" "github.com/dotcloud/docker/pkg/user"
) )

0
pkg/netlink/MAINTAINERS → pkg/libcontainer/netlink/MAINTAINERS
View File

0
pkg/netlink/netlink.go → pkg/libcontainer/netlink/netlink.go
View File

0
pkg/netlink/netlink_linux.go → pkg/libcontainer/netlink/netlink_linux.go
View File

0
pkg/netlink/netlink_unsupported.go → pkg/libcontainer/netlink/netlink_unsupported.go
View File

2
pkg/libcontainer/network/network.go
View File

@ -1,7 +1,7 @@
package network package network
import ( import (
"github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/pkg/libcontainer/netlink"
"net" "net"
) )

0
pkg/selinux/selinux.go → pkg/libcontainer/selinux/selinux.go
View File

2
pkg/selinux/selinux_test.go → pkg/libcontainer/selinux/selinux_test.go
View File

@ -1,7 +1,7 @@
package selinux_test package selinux_test
import ( import (
"github.com/dotcloud/docker/pkg/selinux" "github.com/dotcloud/docker/pkg/libcontainer/selinux"
"os" "os"
"testing" "testing"
) )