1. docker
  2. Commit 8194556337b65dda71a3d4d7f6ae9653ad5a19a0
Browse code

Update libcontainer imports Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby authored on 2014/06/11 11:58:15
Showing 18 changed files
daemon/container.go
History View file @ 8194556
... ... 
@@ -15,6 +15,8 @@ import (
15 15 
 	"syscall"
16 16 
 	"time"
17 17
18 
+	"github.com/docker/libcontainer/devices"
19 
+	"github.com/docker/libcontainer/label"
18 20 
 	"github.com/dotcloud/docker/archive"
19 21 
 	"github.com/dotcloud/docker/daemon/execdriver"
20 22 
 	"github.com/dotcloud/docker/daemon/graphdriver"
... ... 
@@ -22,8 +24,6 @@ import (
22 22 
 	"github.com/dotcloud/docker/image"
23 23 
 	"github.com/dotcloud/docker/links"
24 24 
 	"github.com/dotcloud/docker/nat"
25 
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
26 
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
27 25 
 	"github.com/dotcloud/docker/pkg/networkfs/etchosts"
28 26 
 	"github.com/dotcloud/docker/pkg/networkfs/resolvconf"
29 27 
 	"github.com/dotcloud/docker/pkg/symlink"
daemon/daemon.go
History View file @ 8194556
... ... 
@@ -12,6 +12,8 @@ import (
12 12 
 	"sync"
13 13 
 	"time"
14 14
15 
+	"github.com/docker/libcontainer/label"
16 
+	"github.com/docker/libcontainer/selinux"
15 17 
 	"github.com/dotcloud/docker/archive"
16 18 
 	"github.com/dotcloud/docker/daemon/execdriver"
17 19 
 	"github.com/dotcloud/docker/daemon/execdriver/execdrivers"
... ... 
@@ -26,8 +28,6 @@ import (
26 26 
 	"github.com/dotcloud/docker/graph"
27 27 
 	"github.com/dotcloud/docker/image"
28 28 
 	"github.com/dotcloud/docker/pkg/graphdb"
29 
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
30 
-	"github.com/dotcloud/docker/pkg/libcontainer/selinux"
31 29 
 	"github.com/dotcloud/docker/pkg/namesgenerator"
32 30 
 	"github.com/dotcloud/docker/pkg/networkfs/resolvconf"
33 31 
 	"github.com/dotcloud/docker/pkg/sysinfo"
daemon/execdriver/driver.go
History View file @ 8194556
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"os"
7 7 
 	"os/exec"
8 8
9 
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
9 
+	"github.com/docker/libcontainer/devices"
10 10 
 )
11 11
12 12 
 // Context is a generic key value pair that allows
daemon/execdriver/lxc/driver.go
History View file @ 8194556
... ... 
@@ -15,10 +15,10 @@ import (
15 15 
 	"syscall"
16 16 
 	"time"
17 17
18 
+	"github.com/docker/libcontainer/cgroups"
19 
+	"github.com/docker/libcontainer/label"
20 
+	"github.com/docker/libcontainer/mount/nodes"
18 21 
 	"github.com/dotcloud/docker/daemon/execdriver"
19 
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
20 
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
21 
-	"github.com/dotcloud/docker/pkg/libcontainer/mount/nodes"
22 22 
 	"github.com/dotcloud/docker/pkg/system"
23 23 
 	"github.com/dotcloud/docker/utils"
24 24 
 )
daemon/execdriver/lxc/init.go
History View file @ 8194556
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"strings"
10 10 
 	"syscall"
11 11
12 
+	"github.com/docker/libcontainer/netlink"
12 13 
 	"github.com/dotcloud/docker/daemon/execdriver"
13 
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
14 14 
 	"github.com/dotcloud/docker/pkg/user"
15 15 
 	"github.com/syndtr/gocapability/capability"
16 16 
 )
daemon/execdriver/lxc/lxc_template.go
History View file @ 8194556
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"strings"
5 5 
 	"text/template"
6 6
7 
+	"github.com/docker/libcontainer/label"
7 8 
 	"github.com/dotcloud/docker/daemon/execdriver"
8 
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
9 9 
 )
10 10
11 11 
 const LxcTemplate = `
daemon/execdriver/lxc/lxc_template_unit_test.go
History View file @ 8194556
... ... 
@@ -11,8 +11,8 @@ import (
11 11 
 	"testing"
12 12 
 	"time"
13 13
14 
+	"github.com/docker/libcontainer/devices"
14 15 
 	"github.com/dotcloud/docker/daemon/execdriver"
15 
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
16 16 
 )
17 17
18 18 
 func TestLXCConfig(t *testing.T) {
daemon/execdriver/native/configuration/parse.go
History View file @ 8194556
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"strconv"
8 8 
 	"strings"
9 9
10 
-	"github.com/dotcloud/docker/pkg/libcontainer"
10 
+	"github.com/docker/libcontainer"
11 11 
 	"github.com/dotcloud/docker/pkg/units"
12 12 
 )
13 13
daemon/execdriver/native/configuration/parse_test.go
History View file @ 8194556
... ... 
@@ -3,8 +3,8 @@ package configuration
3 3 
 import (
4 4 
 	"testing"
5 5
6 
+	"github.com/docker/libcontainer"
6 7 
 	"github.com/dotcloud/docker/daemon/execdriver/native/template"
7 
-	"github.com/dotcloud/docker/pkg/libcontainer"
8 8 
 )
9 9
10 10 
 // Checks whether the expected capability is specified in the capabilities.
daemon/execdriver/native/create.go
History View file @ 8194556
... ... 
@@ -6,12 +6,12 @@ import (
6 6 
 	"os/exec"
7 7 
 	"path/filepath"
8 8
9 
+	"github.com/docker/libcontainer"
10 
+	"github.com/docker/libcontainer/apparmor"
11 
+	"github.com/docker/libcontainer/devices"
9 12 
 	"github.com/dotcloud/docker/daemon/execdriver"
10 13 
 	"github.com/dotcloud/docker/daemon/execdriver/native/configuration"
11 14 
 	"github.com/dotcloud/docker/daemon/execdriver/native/template"
12 
-	"github.com/dotcloud/docker/pkg/libcontainer"
13 
-	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
14 
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
15 15 
 )
16 16
17 17 
 // createContainer populates and configures the container type with the
daemon/execdriver/native/driver.go
History View file @ 8194556
... ... 
@@ -11,12 +11,12 @@ import (
11 11 
 	"sync"
12 12 
 	"syscall"
13 13
14 
+	"github.com/docker/libcontainer"
15 
+	"github.com/docker/libcontainer/apparmor"
16 
+	"github.com/docker/libcontainer/cgroups/fs"
17 
+	"github.com/docker/libcontainer/cgroups/systemd"
18 
+	"github.com/docker/libcontainer/namespaces"
14 19 
 	"github.com/dotcloud/docker/daemon/execdriver"
15 
-	"github.com/dotcloud/docker/pkg/libcontainer"
16 
-	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
17 
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
18 
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"
19 
-	"github.com/dotcloud/docker/pkg/libcontainer/namespaces"
20 20 
 	"github.com/dotcloud/docker/pkg/system"
21 21 
 )
22 22
daemon/execdriver/native/template/default_template.go
History View file @ 8194556
... ... 
@@ -1,9 +1,9 @@
1 1 
 package template
2 2
3 3 
 import (
4 
-	"github.com/dotcloud/docker/pkg/libcontainer"
5 
-	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
6 
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
4 
+	"github.com/docker/libcontainer"
5 
+	"github.com/docker/libcontainer/apparmor"
6 
+	"github.com/docker/libcontainer/cgroups"
7 7 
 )
8 8
9 9 
 // New returns the docker default configuration for libcontainer
daemon/graphdriver/aufs/aufs.go
History View file @ 8194556
... ... 
@@ -30,9 +30,9 @@ import (
30 30 
 	"sync"
31 31 
 	"syscall"
32 32
33 
+	"github.com/docker/libcontainer/label"
33 34 
 	"github.com/dotcloud/docker/archive"
34 35 
 	"github.com/dotcloud/docker/daemon/graphdriver"
35 
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
36 36 
 	mountpk "github.com/dotcloud/docker/pkg/mount"
37 37 
 	"github.com/dotcloud/docker/utils"
38 38 
 )
daemon/graphdriver/devmapper/deviceset.go
History View file @ 8194556
... ... 
@@ -18,8 +18,8 @@ import (
18 18 
 	"syscall"
19 19 
 	"time"
20 20
21 
+	"github.com/docker/libcontainer/label"
21 22 
 	"github.com/dotcloud/docker/daemon/graphdriver"
22 
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
23 23 
 	"github.com/dotcloud/docker/pkg/units"
24 24 
 	"github.com/dotcloud/docker/utils"
25 25 
 )
daemon/networkdriver/bridge/driver.go
History View file @ 8194556
... ... 
@@ -8,13 +8,13 @@ import (
8 8 
 	"strings"
9 9 
 	"sync"
10 10
11 
+	"github.com/docker/libcontainer/netlink"
11 12 
 	"github.com/dotcloud/docker/daemon/networkdriver"
12 13 
 	"github.com/dotcloud/docker/daemon/networkdriver/ipallocator"
13 14 
 	"github.com/dotcloud/docker/daemon/networkdriver/portallocator"
14 15 
 	"github.com/dotcloud/docker/daemon/networkdriver/portmapper"
15 16 
 	"github.com/dotcloud/docker/engine"
16 17 
 	"github.com/dotcloud/docker/pkg/iptables"
17 
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
18 18 
 	"github.com/dotcloud/docker/pkg/networkfs/resolvconf"
19 19 
 	"github.com/dotcloud/docker/utils"
20 20 
 )
daemon/networkdriver/network_test.go
History View file @ 8194556
... ... 
@@ -1,7 +1,7 @@
1 1 
 package networkdriver
2 2
3 3 
 import (
4 
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
4 
+	"github.com/docker/libcontainer/netlink"
5 5 
 	"net"
6 6 
 	"testing"
7 7 
 )
daemon/networkdriver/utils.go
History View file @ 8194556
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"fmt"
7 7 
 	"net"
8 8
9 
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
9 
+	"github.com/docker/libcontainer/netlink"
10 10 
 )
11 11
12 12 
 var (
pkg/sysinfo/sysinfo.go
History View file @ 8194556
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"os"
7 7 
 	"path"
8 8
9 
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
9 
+	"github.com/docker/libcontainer/cgroups"
10 10 
 )
11 11
12 12 
 type SysInfo struct {