kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #6317 from crosbymichael/libcontainerdep

Browse source 
Move libcontainer deps into libcontainer
This commit is contained in:
unclejack 2014-06-10 03:16:15 +03:00
commit fb2ac5bedb
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,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"

4
daemon/daemon.go
View file

@ -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"

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

@ -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"

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

@ -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"
)

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

@ -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 = `

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

@ -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"
)

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

@ -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"

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

@ -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"
)

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

@ -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"
)

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

@ -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"
)

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

@ -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"
)

2
daemon/networkdriver/network_test.go
View file

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

2
daemon/networkdriver/utils.go
View file

@ -6,7 +6,7 @@ import (
"fmt"
"net"
"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
)
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"
"syscall"
"github.com/dotcloud/docker/pkg/label"
"github.com/dotcloud/docker/pkg/libcontainer/label"
"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"
"strings"
"github.com/dotcloud/docker/pkg/selinux"
"github.com/dotcloud/docker/pkg/libcontainer/selinux"
)
func GenLabels(options string) (string, string, error) {

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

@ -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"

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

@ -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"
)

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

@ -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"
)

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
import (
"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
"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
import (
"github.com/dotcloud/docker/pkg/selinux"
"github.com/dotcloud/docker/pkg/libcontainer/selinux"
"os"
"testing"
)