Revert "docker is now moby"

This commit was reverted because internally moby still uses import paths pointing at "github.com/docker/docker/...". Until they update their import paths it's better to also remain using the old name. This reverts commit 0db9b58.
yyuuttaaoo · Apr 27, 2017 · 3a67699 · 3a67699
1 parent c3f4bf0
commit 3a67699
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 24 deletions.
diff --git a/build_test.go b/build_test.go
@@ -14,7 +14,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/moby/moby/pkg/archive"
+	"github.com/docker/docker/pkg/archive"
 )
 
 func TestBuildImageMultipleContextsError(t *testing.T) {

diff --git a/client.go b/client.go
@@ -29,11 +29,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/docker/docker/opts"
+	"github.com/docker/docker/pkg/homedir"
+	"github.com/docker/docker/pkg/jsonmessage"
+	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/hashicorp/go-cleanhttp"
-	"github.com/moby/moby/opts"
-	"github.com/moby/moby/pkg/homedir"
-	"github.com/moby/moby/pkg/jsonmessage"
-	"github.com/moby/moby/pkg/stdcopy"
 	"golang.org/x/net/context"
 	"golang.org/x/net/context/ctxhttp"
 )
@@ -258,7 +258,7 @@ func NewVersionedTLSClient(endpoint string, cert, key, ca, apiVersionString stri
 // NewClientFromEnv returns a Client instance ready for communication created from
 // Docker's default logic for the environment variables DOCKER_HOST, DOCKER_TLS_VERIFY, and DOCKER_CERT_PATH.
 //
-// See https://github.com/moby/moby/blob/1f963af697e8df3a78217f6fdbf67b8123a7db94/docker/docker.go#L68.
+// See https://github.com/docker/docker/blob/1f963af697e8df3a78217f6fdbf67b8123a7db94/docker/docker.go#L68.
 // See https://github.com/docker/compose/blob/81707ef1ad94403789166d2fe042c8a718a4c748/compose/cli/docker_client.py#L7.
 func NewClientFromEnv() (*Client, error) {
 	client, err := NewVersionedClientFromEnv("")
@@ -273,7 +273,7 @@ func NewClientFromEnv() (*Client, error) {
 // Docker's default logic for the environment variables DOCKER_HOST, DOCKER_TLS_VERIFY, and DOCKER_CERT_PATH,
 // and using a specific remote API version.
 //
-// See https://github.com/moby/moby/blob/1f963af697e8df3a78217f6fdbf67b8123a7db94/docker/docker.go#L68.
+// See https://github.com/docker/docker/blob/1f963af697e8df3a78217f6fdbf67b8123a7db94/docker/docker.go#L68.
 // See https://github.com/docker/compose/blob/81707ef1ad94403789166d2fe042c8a718a4c748/compose/cli/docker_client.py#L7.
 func NewVersionedClientFromEnv(apiVersionString string) (*Client, error) {
 	dockerEnv, err := getDockerEnv()

diff --git a/misc.go b/misc.go
@@ -9,7 +9,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 )
 
 // Version returns version information about the docker server.

diff --git a/node.go b/node.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"golang.org/x/net/context"
 )
 

diff --git a/node_test.go b/node_test.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 )
 
 func TestListNodes(t *testing.T) {

diff --git a/service.go b/service.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"golang.org/x/net/context"
 )
 

diff --git a/service_test.go b/service_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"encoding/base64"
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"strings"
 )
 

diff --git a/swarm.go b/swarm.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"golang.org/x/net/context"
 )
 

diff --git a/swarm_test.go b/swarm_test.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 )
 
 func TestInitSwarm(t *testing.T) {

diff --git a/tar.go b/tar.go
@@ -13,8 +13,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/moby/moby/pkg/archive"
-	"github.com/moby/moby/pkg/fileutils"
+	"github.com/docker/docker/pkg/archive"
+	"github.com/docker/docker/pkg/fileutils"
 )
 
 func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) {
@@ -32,7 +32,7 @@ func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) {
 	// removed.  The deamon will remove them for us, if needed, after it
 	// parses the Dockerfile.
 	//
-	// https://github.com/moby/moby/issues/8330
+	// https://github.com/docker/docker/issues/8330
 	//
 	forceIncludeFiles := []string{".dockerignore", dockerfilePath}
 

diff --git a/task.go b/task.go
@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"golang.org/x/net/context"
 )
 

diff --git a/task_test.go b/task_test.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/moby/moby/api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 )
 
 func TestListTasks(t *testing.T) {

diff --git a/testing/server.go b/testing/server.go
@@ -26,10 +26,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/fsouza/go-dockerclient"
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/types/swarm"
-	"github.com/moby/moby/pkg/stdcopy"
 )
 
 var nameRegexp = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`)

diff --git a/testing/server_test.go b/testing/server_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/fsouza/go-dockerclient"
-	"github.com/moby/moby/api/types/swarm"
 )
 
 func TestNewServer(t *testing.T) {

diff --git a/testing/swarm.go b/testing/swarm.go
@@ -17,9 +17,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/fsouza/go-dockerclient"
 	"github.com/gorilla/mux"
-	"github.com/moby/moby/api/types/swarm"
 )
 
 type swarmServer struct {

diff --git a/testing/swarm_test.go b/testing/swarm_test.go
@@ -16,8 +16,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/fsouza/go-dockerclient"
-	"github.com/moby/moby/api/types/swarm"
 )
 
 func TestSwarmInit(t *testing.T) {