Merge pull request openshift#127 from crosbymichael/update-docker-imp…

…orts

Update imports for new docker location

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

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"
 )
 

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

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',

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

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.

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{

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 (