Skip to content

Commit

Permalink
Move libcontainer deps into libcontainer
Browse files Browse the repository at this point in the history 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
  • Loading branch information
@crosbymichael
crosbymichael committed Jun 9, 2014
1 parent fd32fc8 commit 6158cca
Show file tree
Hide file tree
Showing 30 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion daemon/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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/label"
"github.com/dotcloud/docker/pkg/libcontainer/devices"
"github.com/dotcloud/docker/pkg/networkfs/etchosts"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf"
Expand Down
4 changes: 2 additions & 2 deletions daemon/daemon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/namesgenerator"
"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/runconfig"
"github.com/dotcloud/docker/utils"
Expand Down
2 changes: 1 addition & 1 deletion daemon/execdriver/lxc/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"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/mount/nodes"
"github.com/dotcloud/docker/pkg/system"
Expand Down
2 changes: 1 addition & 1 deletion daemon/execdriver/lxc/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/execdriver/lxc/lxc_template.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
2 changes: 1 addition & 1 deletion daemon/execdriver/native/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/devices"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/execdriver/native/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"syscall"

"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/cgroups/fs"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"
Expand Down
2 changes: 1 addition & 1 deletion daemon/execdriver/native/template/default_template.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package template

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/cgroups"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/aufs/aufs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/devmapper/deviceset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/networkdriver/bridge/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/networkdriver/network_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package networkdriver

import (
"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
"net"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion daemon/networkdriver/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"net"

"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
)

var (
Expand Down
0 pkg/apparmor/apparmor.go → pkg/libcontainer/apparmor/apparmor.go
View file
File renamed without changes.
0 pkg/apparmor/apparmor_disabled.go → ...ibcontainer/apparmor/apparmor_disabled.go
View file
File renamed without changes.
0 pkg/apparmor/gen.go → pkg/libcontainer/apparmor/gen.go
View file
File renamed without changes.
0 pkg/apparmor/setup.go → pkg/libcontainer/apparmor/setup.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/libcontainer/console/console.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pkg/label/label.go → pkg/libcontainer/label/label.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/label/label_selinux.go → pkg/libcontainer/label/label_selinux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/libcontainer/mount/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/mount/nodes"
"github.com/dotcloud/docker/pkg/symlink"
Expand Down
2 changes: 1 addition & 1 deletion pkg/libcontainer/namespaces/execin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"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/system"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/libcontainer/namespaces/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/console"
"github.com/dotcloud/docker/pkg/libcontainer/mount"
"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/libcontainer/netlink"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/pkg/user"
)
Expand Down
0 pkg/netlink/MAINTAINERS → pkg/libcontainer/netlink/MAINTAINERS
View file
File renamed without changes.
0 pkg/netlink/netlink.go → pkg/libcontainer/netlink/netlink.go
View file
File renamed without changes.
0 pkg/netlink/netlink_linux.go → pkg/libcontainer/netlink/netlink_linux.go
View file
File renamed without changes.
0 pkg/netlink/netlink_unsupported.go → ...bcontainer/netlink/netlink_unsupported.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/libcontainer/network/network.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package network

import (
"github.com/dotcloud/docker/pkg/netlink"
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
"net"
)

Expand Down
0 pkg/selinux/selinux.go → pkg/libcontainer/selinux/selinux.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/selinux/selinux_test.go → pkg/libcontainer/selinux/selinux_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package selinux_test

import (
"github.com/dotcloud/docker/pkg/selinux"
"github.com/dotcloud/docker/pkg/libcontainer/selinux"
"os"
"testing"
)
Expand Down

0 comments on commit 6158cca

Please sign in to comment.