vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Move libcontainer deps into libcontainer

Browse source 
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 f0daa9fd81
commit 1a1cffad1b
17 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
apparmor/apparmor.go → libcontainer/apparmor/apparmor.go
View file

0
apparmor/apparmor_disabled.go → libcontainer/apparmor/apparmor_disabled.go
View file

0
apparmor/gen.go → libcontainer/apparmor/gen.go
View file

0
apparmor/setup.go → libcontainer/apparmor/setup.go
View file

2
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
label/label.go → libcontainer/label/label.go
View file

2
label/label_selinux.go → 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
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
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
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
netlink/MAINTAINERS → libcontainer/netlink/MAINTAINERS
View file

0
netlink/netlink.go → libcontainer/netlink/netlink.go
View file

0
netlink/netlink_linux.go → libcontainer/netlink/netlink_linux.go
View file

0
netlink/netlink_unsupported.go → libcontainer/netlink/netlink_unsupported.go
View file

2
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
selinux/selinux.go → libcontainer/selinux/selinux.go
View file

2
selinux/selinux_test.go → 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"
) )