From 6ab3ef56f452165c1ae0111ffcbbd40e2ca07360 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 10 Jun 2014 08:14:16 -0700 Subject: [PATCH] Update imports for new repository path --- cgroups/cgroups.go | 2 +- cgroups/fs/apply_raw.go | 2 +- cgroups/fs/blkio.go | 2 +- cgroups/fs/blkio_test.go | 2 +- cgroups/fs/cpu.go | 2 +- cgroups/fs/cpu_test.go | 2 +- cgroups/fs/cpuacct.go | 2 +- cgroups/fs/cpuset.go | 2 +- cgroups/fs/devices.go | 2 +- cgroups/fs/freezer.go | 2 +- cgroups/fs/memory.go | 2 +- cgroups/fs/memory_test.go | 2 +- cgroups/fs/perf_event.go | 2 +- cgroups/fs/stats_test_util.go | 2 +- cgroups/systemd/apply_nosystemd.go | 2 +- cgroups/systemd/apply_systemd.go | 2 +- console/console.go | 2 +- container.go | 4 ++-- label/label_selinux.go | 2 +- mount/init.go | 6 +++--- mount/nodes/nodes.go | 2 +- mount/nodes/nodes_unsupported.go | 4 ++-- mount/ptmx.go | 2 +- namespaces/create.go | 2 +- namespaces/exec.go | 10 +++++----- namespaces/execin.go | 4 ++-- namespaces/init.go | 20 ++++++++++---------- namespaces/sync_pipe.go | 2 +- namespaces/unsupported.go | 4 ++-- network/loopback.go | 2 +- network/netns.go | 2 +- network/network.go | 2 +- network/strategy.go | 2 +- network/veth.go | 4 ++-- nsinit/exec.go | 4 ++-- nsinit/init.go | 2 +- nsinit/nsenter.go | 2 +- nsinit/spec.go | 2 +- nsinit/stats.go | 4 ++-- nsinit/utils.go | 2 +- security/capabilities/capabilities.go | 2 +- selinux/selinux_test.go | 2 +- 42 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cgroups/cgroups.go b/cgroups/cgroups.go index 85607b54..64ece568 100644 --- a/cgroups/cgroups.go +++ b/cgroups/cgroups.go @@ -3,7 +3,7 @@ package cgroups import ( "errors" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/devices" ) var ( diff --git a/cgroups/fs/apply_raw.go b/cgroups/fs/apply_raw.go index 2231ab9a..1a0323f4 100644 --- a/cgroups/fs/apply_raw.go +++ b/cgroups/fs/apply_raw.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) var ( diff --git a/cgroups/fs/blkio.go b/cgroups/fs/blkio.go index 0c7a4e7b..0e0a198d 100644 --- a/cgroups/fs/blkio.go +++ b/cgroups/fs/blkio.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type blkioGroup struct { diff --git a/cgroups/fs/blkio_test.go b/cgroups/fs/blkio_test.go index d91a6479..c916c86b 100644 --- a/cgroups/fs/blkio_test.go +++ b/cgroups/fs/blkio_test.go @@ -3,7 +3,7 @@ package fs import ( "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) const ( diff --git a/cgroups/fs/cpu.go b/cgroups/fs/cpu.go index 2e9d588f..1c692fd5 100644 --- a/cgroups/fs/cpu.go +++ b/cgroups/fs/cpu.go @@ -7,7 +7,7 @@ import ( "strconv" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type cpuGroup struct { diff --git a/cgroups/fs/cpu_test.go b/cgroups/fs/cpu_test.go index c5bfc504..ebdb6a57 100644 --- a/cgroups/fs/cpu_test.go +++ b/cgroups/fs/cpu_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) func TestCpuStats(t *testing.T) { diff --git a/cgroups/fs/cpuacct.go b/cgroups/fs/cpuacct.go index 5ea01dc9..fe831d1b 100644 --- a/cgroups/fs/cpuacct.go +++ b/cgroups/fs/cpuacct.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" "github.com/dotcloud/docker/pkg/system" ) diff --git a/cgroups/fs/cpuset.go b/cgroups/fs/cpuset.go index c0b03c55..094e8b38 100644 --- a/cgroups/fs/cpuset.go +++ b/cgroups/fs/cpuset.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type cpusetGroup struct { diff --git a/cgroups/fs/devices.go b/cgroups/fs/devices.go index 45c3b485..675cef3f 100644 --- a/cgroups/fs/devices.go +++ b/cgroups/fs/devices.go @@ -1,6 +1,6 @@ package fs -import "github.com/dotcloud/docker/pkg/libcontainer/cgroups" +import "github.com/docker/libcontainer/cgroups" type devicesGroup struct { } diff --git a/cgroups/fs/freezer.go b/cgroups/fs/freezer.go index 5c9ba5b5..f6a1044a 100644 --- a/cgroups/fs/freezer.go +++ b/cgroups/fs/freezer.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type freezerGroup struct { diff --git a/cgroups/fs/memory.go b/cgroups/fs/memory.go index 202ddc8e..b4453f4e 100644 --- a/cgroups/fs/memory.go +++ b/cgroups/fs/memory.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type memoryGroup struct { diff --git a/cgroups/fs/memory_test.go b/cgroups/fs/memory_test.go index 29aea1f2..8307482b 100644 --- a/cgroups/fs/memory_test.go +++ b/cgroups/fs/memory_test.go @@ -3,7 +3,7 @@ package fs import ( "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) const ( diff --git a/cgroups/fs/perf_event.go b/cgroups/fs/perf_event.go index 1eb4df11..b834c3ec 100644 --- a/cgroups/fs/perf_event.go +++ b/cgroups/fs/perf_event.go @@ -1,7 +1,7 @@ package fs import ( - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) type perfEventGroup struct { diff --git a/cgroups/fs/stats_test_util.go b/cgroups/fs/stats_test_util.go index bebd0cb3..7e7da754 100644 --- a/cgroups/fs/stats_test_util.go +++ b/cgroups/fs/stats_test_util.go @@ -5,7 +5,7 @@ import ( "log" "testing" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error { diff --git a/cgroups/systemd/apply_nosystemd.go b/cgroups/systemd/apply_nosystemd.go index c72bb116..6dcfdffd 100644 --- a/cgroups/systemd/apply_nosystemd.go +++ b/cgroups/systemd/apply_nosystemd.go @@ -5,7 +5,7 @@ package systemd import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" ) func UseSystemd() bool { diff --git a/cgroups/systemd/apply_systemd.go b/cgroups/systemd/apply_systemd.go index c486dbeb..6a0ce950 100644 --- a/cgroups/systemd/apply_systemd.go +++ b/cgroups/systemd/apply_systemd.go @@ -14,7 +14,7 @@ import ( "time" systemd1 "github.com/coreos/go-systemd/dbus" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups" "github.com/dotcloud/docker/pkg/systemd" "github.com/godbus/dbus" ) diff --git a/console/console.go b/console/console.go index ccab5281..519b5644 100644 --- a/console/console.go +++ b/console/console.go @@ -8,7 +8,7 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/label" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/pkg/system" ) diff --git a/container.go b/container.go index c5864e94..be72d92e 100644 --- a/container.go +++ b/container.go @@ -1,8 +1,8 @@ package libcontainer import ( - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/devices" ) // Context is a generic key value pair that allows arbatrary data to be sent diff --git a/label/label_selinux.go b/label/label_selinux.go index 1ef8891e..04521444 100644 --- a/label/label_selinux.go +++ b/label/label_selinux.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/dotcloud/docker/pkg/libcontainer/selinux" + "github.com/docker/libcontainer/selinux" ) func GenLabels(options string) (string, string, error) { diff --git a/mount/init.go b/mount/init.go index 0338fe7c..4e913ad1 100644 --- a/mount/init.go +++ b/mount/init.go @@ -8,9 +8,9 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/label" - "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/mount/nodes" "github.com/dotcloud/docker/pkg/symlink" "github.com/dotcloud/docker/pkg/system" ) diff --git a/mount/nodes/nodes.go b/mount/nodes/nodes.go index dd67ae2d..e3420b48 100644 --- a/mount/nodes/nodes.go +++ b/mount/nodes/nodes.go @@ -8,7 +8,7 @@ import ( "path/filepath" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer/devices" "github.com/dotcloud/docker/pkg/system" ) diff --git a/mount/nodes/nodes_unsupported.go b/mount/nodes/nodes_unsupported.go index 0e5d12c7..3811a1d7 100644 --- a/mount/nodes/nodes_unsupported.go +++ b/mount/nodes/nodes_unsupported.go @@ -3,8 +3,8 @@ package nodes import ( - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/devices" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/devices" ) func CreateDeviceNodes(rootfs string, nodesToCreate []*devices.Device) error { diff --git a/mount/ptmx.go b/mount/ptmx.go index f6ca5346..32c02520 100644 --- a/mount/ptmx.go +++ b/mount/ptmx.go @@ -4,7 +4,7 @@ package mount import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer/console" + "github.com/docker/libcontainer/console" "os" "path/filepath" ) diff --git a/namespaces/create.go b/namespaces/create.go index 60b2a2db..20bef204 100644 --- a/namespaces/create.go +++ b/namespaces/create.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) type CreateCommand func(container *libcontainer.Container, console, rootfs, dataPath, init string, childPipe *os.File, args []string) *exec.Cmd diff --git a/namespaces/exec.go b/namespaces/exec.go index 288205ea..31d5ba21 100644 --- a/namespaces/exec.go +++ b/namespaces/exec.go @@ -7,11 +7,11 @@ import ( "os/exec" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd" - "github.com/dotcloud/docker/pkg/libcontainer/network" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups/fs" + "github.com/docker/libcontainer/cgroups/systemd" + "github.com/docker/libcontainer/network" "github.com/dotcloud/docker/pkg/system" ) diff --git a/namespaces/execin.go b/namespaces/execin.go index e4f07ae1..97bbb5f7 100644 --- a/namespaces/execin.go +++ b/namespaces/execin.go @@ -7,8 +7,8 @@ import ( "os" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/label" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/label" "github.com/dotcloud/docker/pkg/system" ) diff --git a/namespaces/init.go b/namespaces/init.go index 27cd9bfd..9bad7cc9 100644 --- a/namespaces/init.go +++ b/namespaces/init.go @@ -9,16 +9,16 @@ import ( "strings" "syscall" - "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/docker/libcontainer" + "github.com/docker/libcontainer/apparmor" + "github.com/docker/libcontainer/console" + "github.com/docker/libcontainer/label" + "github.com/docker/libcontainer/mount" + "github.com/docker/libcontainer/netlink" + "github.com/docker/libcontainer/network" + "github.com/docker/libcontainer/security/capabilities" + "github.com/docker/libcontainer/security/restrict" + "github.com/docker/libcontainer/utils" "github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/user" ) diff --git a/namespaces/sync_pipe.go b/namespaces/sync_pipe.go index e12ed447..6fa84657 100644 --- a/namespaces/sync_pipe.go +++ b/namespaces/sync_pipe.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) // SyncPipe allows communication to and from the child processes diff --git a/namespaces/unsupported.go b/namespaces/unsupported.go index b459b4d2..a0653ee8 100644 --- a/namespaces/unsupported.go +++ b/namespaces/unsupported.go @@ -3,8 +3,8 @@ package namespaces import ( - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups" ) func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath string, args []string, createCommand CreateCommand, startCallback func()) (int, error) { diff --git a/network/loopback.go b/network/loopback.go index 6215061d..218d1959 100644 --- a/network/loopback.go +++ b/network/loopback.go @@ -2,7 +2,7 @@ package network import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) // Loopback is a network strategy that provides a basic loopback device diff --git a/network/netns.go b/network/netns.go index 7e311f22..e8a9188d 100644 --- a/network/netns.go +++ b/network/netns.go @@ -5,7 +5,7 @@ import ( "os" "syscall" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" "github.com/dotcloud/docker/pkg/system" ) diff --git a/network/network.go b/network/network.go index 75d00401..94cd711d 100644 --- a/network/network.go +++ b/network/network.go @@ -1,7 +1,7 @@ package network import ( - "github.com/dotcloud/docker/pkg/libcontainer/netlink" + "github.com/docker/libcontainer/netlink" "net" ) diff --git a/network/strategy.go b/network/strategy.go index e41ecc3e..321cf58e 100644 --- a/network/strategy.go +++ b/network/strategy.go @@ -3,7 +3,7 @@ package network import ( "errors" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) var ( diff --git a/network/veth.go b/network/veth.go index d3be221c..4dad4aa2 100644 --- a/network/veth.go +++ b/network/veth.go @@ -2,8 +2,8 @@ package network import ( "fmt" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/utils" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/utils" ) // Veth is a network strategy that uses a bridge and creates diff --git a/nsinit/exec.go b/nsinit/exec.go index d4ce1ca8..5bbfd088 100644 --- a/nsinit/exec.go +++ b/nsinit/exec.go @@ -8,8 +8,8 @@ import ( "os/signal" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/namespaces" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/namespaces" ) var execCommand = cli.Command{ diff --git a/nsinit/init.go b/nsinit/init.go index 20096f02..eedb9610 100644 --- a/nsinit/init.go +++ b/nsinit/init.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer/namespaces" + "github.com/docker/libcontainer/namespaces" ) var ( diff --git a/nsinit/nsenter.go b/nsinit/nsenter.go index 54644282..8a9caa75 100644 --- a/nsinit/nsenter.go +++ b/nsinit/nsenter.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer/namespaces" + "github.com/docker/libcontainer/namespaces" ) var nsenterCommand = cli.Command{ diff --git a/nsinit/spec.go b/nsinit/spec.go index 2eb4da9f..24294ff3 100644 --- a/nsinit/spec.go +++ b/nsinit/spec.go @@ -6,7 +6,7 @@ import ( "log" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) var specCommand = cli.Command{ diff --git a/nsinit/stats.go b/nsinit/stats.go index 023b40a8..ff6a1ce5 100644 --- a/nsinit/stats.go +++ b/nsinit/stats.go @@ -6,8 +6,8 @@ import ( "log" "github.com/codegangsta/cli" - "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" + "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups/fs" ) var statsCommand = cli.Command{ diff --git a/nsinit/utils.go b/nsinit/utils.go index 9926e272..bd49434e 100644 --- a/nsinit/utils.go +++ b/nsinit/utils.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strconv" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" ) func loadContainer() (*libcontainer.Container, error) { diff --git a/security/capabilities/capabilities.go b/security/capabilities/capabilities.go index 64ea961a..ef872178 100644 --- a/security/capabilities/capabilities.go +++ b/security/capabilities/capabilities.go @@ -3,7 +3,7 @@ package capabilities import ( "os" - "github.com/dotcloud/docker/pkg/libcontainer" + "github.com/docker/libcontainer" "github.com/syndtr/gocapability/capability" ) diff --git a/selinux/selinux_test.go b/selinux/selinux_test.go index 0e900c1d..40ed70d1 100644 --- a/selinux/selinux_test.go +++ b/selinux/selinux_test.go @@ -1,7 +1,7 @@ package selinux_test import ( - "github.com/dotcloud/docker/pkg/libcontainer/selinux" + "github.com/docker/libcontainer/selinux" "os" "testing" )