Update libcontainer imports

crosbymichael · crosbymichael · commit 8194556337b6 · 2014-06-10T19:58:15.000-07:00
Docker-DCO-1.1-Signed-off-by: Michael Crosby &lt;michael@crosbymichael.com&gt; (github: crosbymichael)
diff --git a/daemon/container.go b/daemon/container.go
@@ -15,15 +15,15 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/docker/libcontainer/devices"
+	"github.com/docker/libcontainer/label"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/daemon/execdriver"
 	"github.com/dotcloud/docker/daemon/graphdriver"
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/links"
 	"github.com/dotcloud/docker/nat"
-	"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"
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -12,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/docker/libcontainer/label"
+	"github.com/docker/libcontainer/selinux"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/daemon/execdriver"
 	"github.com/dotcloud/docker/daemon/execdriver/execdrivers"
@@ -26,8 +28,6 @@ import (
 	"github.com/dotcloud/docker/graph"
 	"github.com/dotcloud/docker/image"
 	"github.com/dotcloud/docker/pkg/graphdb"
-	"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/sysinfo"
diff --git a/daemon/execdriver/driver.go b/daemon/execdriver/driver.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
+	"github.com/docker/libcontainer/devices"
 )
 
 // Context is a generic key value pair that allows
diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go
@@ -15,10 +15,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/docker/libcontainer/cgroups"
+	"github.com/docker/libcontainer/label"
+	"github.com/docker/libcontainer/mount/nodes"
 	"github.com/dotcloud/docker/daemon/execdriver"
-	"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"
 )
diff --git a/daemon/execdriver/lxc/init.go b/daemon/execdriver/lxc/init.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/docker/libcontainer/netlink"
 	"github.com/dotcloud/docker/daemon/execdriver"
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
 	"github.com/dotcloud/docker/pkg/user"
 	"github.com/syndtr/gocapability/capability"
 )
diff --git a/daemon/execdriver/lxc/lxc_template.go b/daemon/execdriver/lxc/lxc_template.go
@@ -4,8 +4,8 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/docker/libcontainer/label"
 	"github.com/dotcloud/docker/daemon/execdriver"
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
 )
 
 const LxcTemplate = `
diff --git a/daemon/execdriver/lxc/lxc_template_unit_test.go b/daemon/execdriver/lxc/lxc_template_unit_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/docker/libcontainer/devices"
 	"github.com/dotcloud/docker/daemon/execdriver"
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
 )
 
 func TestLXCConfig(t *testing.T) {
diff --git a/daemon/execdriver/native/configuration/parse.go b/daemon/execdriver/native/configuration/parse.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/dotcloud/docker/pkg/libcontainer"
+	"github.com/docker/libcontainer"
 	"github.com/dotcloud/docker/pkg/units"
 )
 
diff --git a/daemon/execdriver/native/configuration/parse_test.go b/daemon/execdriver/native/configuration/parse_test.go
@@ -3,8 +3,8 @@ package configuration
 import (
 	"testing"
 
+	"github.com/docker/libcontainer"
 	"github.com/dotcloud/docker/daemon/execdriver/native/template"
-	"github.com/dotcloud/docker/pkg/libcontainer"
 )
 
 // Checks whether the expected capability is specified in the capabilities.
diff --git a/daemon/execdriver/native/create.go b/daemon/execdriver/native/create.go
@@ -6,12 +6,12 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	"github.com/docker/libcontainer"
+	"github.com/docker/libcontainer/apparmor"
+	"github.com/docker/libcontainer/devices"
 	"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/libcontainer"
-	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
-	"github.com/dotcloud/docker/pkg/libcontainer/devices"
 )
 
 // createContainer populates and configures the container type with the
diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go
@@ -11,12 +11,12 @@ import (
 	"sync"
 	"syscall"
 
+	"github.com/docker/libcontainer"
+	"github.com/docker/libcontainer/apparmor"
+	"github.com/docker/libcontainer/cgroups/fs"
+	"github.com/docker/libcontainer/cgroups/systemd"
+	"github.com/docker/libcontainer/namespaces"
 	"github.com/dotcloud/docker/daemon/execdriver"
-	"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"
 	"github.com/dotcloud/docker/pkg/system"
 )
 
diff --git a/daemon/execdriver/native/template/default_template.go b/daemon/execdriver/native/template/default_template.go
@@ -1,9 +1,9 @@
 package template
 
 import (
-	"github.com/dotcloud/docker/pkg/libcontainer"
-	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
+	"github.com/docker/libcontainer"
+	"github.com/docker/libcontainer/apparmor"
+	"github.com/docker/libcontainer/cgroups"
 )
 
 // New returns the docker default configuration for libcontainer
diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go
@@ -30,9 +30,9 @@ import (
 	"sync"
 	"syscall"
 
+	"github.com/docker/libcontainer/label"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/daemon/graphdriver"
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
 	mountpk "github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/utils"
 )
diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
@@ -18,8 +18,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/docker/libcontainer/label"
 	"github.com/dotcloud/docker/daemon/graphdriver"
-	"github.com/dotcloud/docker/pkg/libcontainer/label"
 	"github.com/dotcloud/docker/pkg/units"
 	"github.com/dotcloud/docker/utils"
 )
diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go
@@ -8,13 +8,13 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/docker/libcontainer/netlink"
 	"github.com/dotcloud/docker/daemon/networkdriver"
 	"github.com/dotcloud/docker/daemon/networkdriver/ipallocator"
 	"github.com/dotcloud/docker/daemon/networkdriver/portallocator"
 	"github.com/dotcloud/docker/daemon/networkdriver/portmapper"
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/pkg/iptables"
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
 	"github.com/dotcloud/docker/pkg/networkfs/resolvconf"
 	"github.com/dotcloud/docker/utils"
 )
diff --git a/daemon/networkdriver/network_test.go b/daemon/networkdriver/network_test.go
@@ -1,7 +1,7 @@
 package networkdriver
 
 import (
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
+	"github.com/docker/libcontainer/netlink"
 	"net"
 	"testing"
 )
diff --git a/daemon/networkdriver/utils.go b/daemon/networkdriver/utils.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/dotcloud/docker/pkg/libcontainer/netlink"
+	"github.com/docker/libcontainer/netlink"
 )
 
 var (
diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
+	"github.com/docker/libcontainer/cgroups"
 )
 
 type SysInfo struct {

Original file line number	Diff line number	Diff line change
`@@ -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`
Original file line number	Diff line number	Diff line change
`@@ -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`	`)`
Original file line number	Diff line number	Diff line change
`@@ -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 = `
Original file line number	Diff line number	Diff line change
`@@ -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) {`
Original file line number	Diff line number	Diff line change
`@@ -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`
Original file line number	Diff line number	Diff line change
`@@ -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.`