From 4568ca76c898de513dcfeb1c042b48b352c02f19 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 24 Jul 2014 14:21:02 -0700 Subject: [PATCH] Update imports for new docker location Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- Dockerfile | 2 +- cgroups/systemd/apply_systemd.go | 2 +- cgroups/utils.go | 2 +- devices/defaults.go | 4 ++-- mount/init.go | 2 +- namespaces/init.go | 2 +- nsinit/exec.go | 2 +- selinux/selinux.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51fe268e5..1fbba3e53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN go get code.google.com/p/go.tools/cmd/cover RUN mkdir /busybox && \ curl -sSL 'https://github.com/jpetazzo/docker-busybox/raw/buildroot-2014.02/rootfs.tar' | tar -xC /busybox -RUN curl -sSL https://raw.githubusercontent.com/dotcloud/docker/master/hack/dind -o /dind && \ +RUN curl -sSL https://raw.githubusercontent.com/docker/docker/master/hack/dind -o /dind && \ chmod +x /dind COPY . /go/src/github.com/docker/libcontainer diff --git a/cgroups/systemd/apply_systemd.go b/cgroups/systemd/apply_systemd.go index 5755a5f4b..01e5bf49b 100644 --- a/cgroups/systemd/apply_systemd.go +++ b/cgroups/systemd/apply_systemd.go @@ -14,9 +14,9 @@ import ( "time" systemd1 "github.com/coreos/go-systemd/dbus" + "github.com/docker/docker/pkg/systemd" "github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups/fs" - "github.com/dotcloud/docker/pkg/systemd" "github.com/godbus/dbus" ) diff --git a/cgroups/utils.go b/cgroups/utils.go index 6fed5cf39..ce5c4f336 100644 --- a/cgroups/utils.go +++ b/cgroups/utils.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/dotcloud/docker/pkg/mount" + "github.com/docker/docker/pkg/mount" ) // https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt diff --git a/devices/defaults.go b/devices/defaults.go index 393c438c5..e0ad0b08f 100644 --- a/devices/defaults.go +++ b/devices/defaults.go @@ -146,8 +146,8 @@ var ( // /dev/fuse is created but not allowed. // This is to allow java to work. Because java // Insists on there being a /dev/fuse - // https://github.com/dotcloud/docker/issues/514 - // https://github.com/dotcloud/docker/issues/2393 + // https://github.com/docker/docker/issues/514 + // https://github.com/docker/docker/issues/2393 // Path: "/dev/fuse", Type: 'c', diff --git a/mount/init.go b/mount/init.go index 725c0259f..7edea4999 100644 --- a/mount/init.go +++ b/mount/init.go @@ -8,9 +8,9 @@ import ( "path/filepath" "syscall" + "github.com/docker/docker/pkg/symlink" "github.com/docker/libcontainer/label" "github.com/docker/libcontainer/mount/nodes" - "github.com/dotcloud/docker/pkg/symlink" ) // default mount point flags diff --git a/namespaces/init.go b/namespaces/init.go index 62452cba1..e43db3965 100644 --- a/namespaces/init.go +++ b/namespaces/init.go @@ -9,6 +9,7 @@ import ( "strings" "syscall" + "github.com/docker/docker/pkg/user" "github.com/docker/libcontainer" "github.com/docker/libcontainer/apparmor" "github.com/docker/libcontainer/console" @@ -21,7 +22,6 @@ import ( "github.com/docker/libcontainer/syncpipe" "github.com/docker/libcontainer/system" "github.com/docker/libcontainer/utils" - "github.com/dotcloud/docker/pkg/user" ) // TODO(vishh): This is part of the libcontainer API and it does much more than just namespaces related work. diff --git a/nsinit/exec.go b/nsinit/exec.go index 6d76aaf29..5d4104665 100644 --- a/nsinit/exec.go +++ b/nsinit/exec.go @@ -10,10 +10,10 @@ import ( "syscall" "github.com/codegangsta/cli" + "github.com/docker/docker/pkg/term" "github.com/docker/libcontainer" consolepkg "github.com/docker/libcontainer/console" "github.com/docker/libcontainer/namespaces" - "github.com/dotcloud/docker/pkg/term" ) var execCommand = cli.Command{ diff --git a/selinux/selinux.go b/selinux/selinux.go index 55da87ff2..bfa79578f 100644 --- a/selinux/selinux.go +++ b/selinux/selinux.go @@ -15,8 +15,8 @@ import ( "strings" "syscall" + "github.com/docker/docker/pkg/mount" "github.com/docker/libcontainer/system" - "github.com/dotcloud/docker/pkg/mount" ) const (