Update imports.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

cli/command/checkpoint/cmd.go

@@ -1,8 +1,8 @@
 package checkpoint
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/checkpoint/create.go

@@ -5,9 +5,9 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/checkpoint/list.go

@@ -3,10 +3,10 @@ package checkpoint
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
 	"github.com/spf13/cobra"
 )
 

cli/command/checkpoint/remove.go

@@ -3,9 +3,9 @@ package checkpoint
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/cli.go

@@ -8,14 +8,14 @@ import (
 	"path/filepath"
 	"runtime"
 
+	cliconfig "github.com/docker/cli/cli/config"
+	"github.com/docker/cli/cli/config/configfile"
+	"github.com/docker/cli/cli/config/credentials"
+	cliflags "github.com/docker/cli/cli/flags"
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/versions"
-	cliconfig "github.com/docker/docker/cli/config"
-	"github.com/docker/docker/cli/config/configfile"
-	"github.com/docker/docker/cli/config/credentials"
-	cliflags "github.com/docker/docker/cli/flags"
-	"github.com/docker/docker/client"
 	"github.com/docker/docker/dockerversion"
 	dopts "github.com/docker/docker/opts"
 	"github.com/docker/go-connections/sockets"

cli/command/commands/commands.go

@@ -3,20 +3,20 @@ package commands
 import (
 	"os"
 
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/checkpoint"
-	"github.com/docker/docker/cli/command/container"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/cli/command/network"
-	"github.com/docker/docker/cli/command/node"
-	"github.com/docker/docker/cli/command/plugin"
-	"github.com/docker/docker/cli/command/registry"
-	"github.com/docker/docker/cli/command/secret"
-	"github.com/docker/docker/cli/command/service"
-	"github.com/docker/docker/cli/command/stack"
-	"github.com/docker/docker/cli/command/swarm"
-	"github.com/docker/docker/cli/command/system"
-	"github.com/docker/docker/cli/command/volume"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/checkpoint"
+	"github.com/docker/cli/cli/command/container"
+	"github.com/docker/cli/cli/command/image"
+	"github.com/docker/cli/cli/command/network"
+	"github.com/docker/cli/cli/command/node"
+	"github.com/docker/cli/cli/command/plugin"
+	"github.com/docker/cli/cli/command/registry"
+	"github.com/docker/cli/cli/command/secret"
+	"github.com/docker/cli/cli/command/service"
+	"github.com/docker/cli/cli/command/stack"
+	"github.com/docker/cli/cli/command/swarm"
+	"github.com/docker/cli/cli/command/system"
+	"github.com/docker/cli/cli/command/volume"
 	"github.com/spf13/cobra"
 )
 

cli/command/container/attach.go

@@ -5,9 +5,9 @@ import (
 	"net/http/httputil"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/container/cmd.go

@@ -1,8 +1,8 @@
 package container
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/container/commit.go

@@ -3,9 +3,9 @@ package container
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	dockeropts "github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/cp.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/system"
 	"github.com/pkg/errors"

cli/command/container/create.go

@@ -5,13 +5,13 @@ import (
 	"io"
 	"os"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/image"
+	apiclient "github.com/docker/cli/client"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image"
-	apiclient "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/registry"
 	"github.com/pkg/errors"

cli/command/container/diff.go

@@ -1,9 +1,9 @@
 package container
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/exec.go

@@ -5,10 +5,10 @@ import (
 	"io"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	apiclient "github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	apiclient "github.com/docker/docker/client"
 	options "github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/spf13/cobra"

cli/command/container/export.go

@@ -3,8 +3,8 @@ package container
 import (
 	"io"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/hijack.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/stdcopy"
 	"golang.org/x/net/context"
 )

cli/command/container/inspect.go

@@ -1,9 +1,9 @@
 package container
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/inspect"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/container/kill.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/list.go

@@ -3,10 +3,10 @@ package container
 import (
 	"io/ioutil"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/templates"
 	"github.com/spf13/cobra"

cli/command/container/logs.go

@@ -3,9 +3,9 @@ package container
 import (
 	"io"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/pause.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/port.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/go-connections/nat"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/container/prune.go

@@ -3,8 +3,8 @@ package container
 import (
 	"fmt"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/opts"
 	units "github.com/docker/go-units"
 	"github.com/spf13/cobra"

cli/command/container/rename.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/restart.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/rm.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/run.go

@@ -10,10 +10,10 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/libnetwork/resolvconf/dns"

cli/command/container/start.go

@@ -6,9 +6,9 @@ import (
 	"net/http/httputil"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/pkg/errors"

cli/command/container/stats.go

@@ -7,12 +7,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/stats_helpers.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli/command/formatter"
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 	"golang.org/x/net/context"
 )

cli/command/container/stop.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/top.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/container/tty.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/signal"
 	"golang.org/x/net/context"
 )

cli/command/container/unpause.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/container/update.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/pkg/errors"

cli/command/container/utils.go

@@ -4,12 +4,12 @@ import (
 	"strconv"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli/command"
+	clientapi "github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/cli/command"
-	clientapi "github.com/docker/docker/client"
 	"golang.org/x/net/context"
 )
 

cli/command/container/wait.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/formatter/node.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/inspect"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
 	units "github.com/docker/go-units"
 )
 

cli/command/formatter/service.go

@@ -5,11 +5,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/cli/cli/command/inspect"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
 	mounttypes "github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command/inspect"
 	"github.com/docker/docker/pkg/stringid"
 	units "github.com/docker/go-units"
 	"github.com/pkg/errors"

cli/command/formatter/task.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-units"
 )

cli/command/idresolver/client_test.go

@@ -1,9 +1,9 @@
 package idresolver
 
 import (
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 )
 

cli/command/idresolver/idresolver.go

@@ -3,9 +3,9 @@ package idresolver
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 )
 

cli/command/idresolver/idresolver_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/docker/docker/api/types/swarm"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"

cli/command/image/build.go

@@ -13,14 +13,14 @@ import (
 	"runtime"
 	"time"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/image/build"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder/dockerignore"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image/build"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/fileutils"

cli/command/image/cmd.go

@@ -3,8 +3,8 @@ package image
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 )
 
 // NewImageCommand returns a cobra command for `image` subcommands

cli/command/image/history.go

@@ -3,9 +3,9 @@ package image
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/spf13/cobra"
 )
 

cli/command/image/import.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	dockeropts "github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/urlutil"

cli/command/image/inspect.go

@@ -3,9 +3,9 @@ package image
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/inspect"
 	"github.com/spf13/cobra"
 )
 

cli/command/image/list.go

@@ -3,10 +3,10 @@ package image
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )

cli/command/image/load.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/system"
 	"github.com/pkg/errors"

cli/command/image/prune.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/opts"
 	units "github.com/docker/go-units"
 	"github.com/spf13/cobra"

cli/command/image/pull.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/registry"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/image/push.go

@@ -3,9 +3,9 @@ package image
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/registry"
 	"github.com/spf13/cobra"

cli/command/image/remove.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cli/command/image/save.go

@@ -3,8 +3,8 @@ package image
 import (
 	"io"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/image/tag.go

@@ -3,8 +3,8 @@ package image
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/image/trust.go

@@ -9,10 +9,10 @@ import (
 	"sort"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/trust"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/trust"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/registry"
 	"github.com/docker/notary/client"

cli/command/image/trust_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/docker/cli/cli/trust"
 	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/cli/trust"
 	"github.com/docker/docker/registry"
 )
 

cli/command/inspect/inspector.go

@@ -8,7 +8,7 @@ import (
 	"text/template"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/cli"
+	"github.com/docker/cli/cli"
 	"github.com/docker/docker/pkg/templates"
 	"github.com/pkg/errors"
 )

cli/command/network/cmd.go

@@ -3,8 +3,8 @@ package network
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 )
 
 // NewNetworkCommand returns a cobra command for `network` subcommands

cli/command/network/connect.go

@@ -3,9 +3,9 @@ package network
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )

cli/command/network/create.go

@@ -7,10 +7,10 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/pkg/errors"

cli/command/network/disconnect.go

@@ -3,8 +3,8 @@ package network
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/network/inspect.go

@@ -3,9 +3,9 @@ package network
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/inspect"
 	"github.com/spf13/cobra"
 )
 

cli/command/network/list.go

@@ -5,10 +5,10 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )

cli/command/network/prune.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )

cli/command/network/remove.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/node/client_test.go

@@ -1,9 +1,9 @@
 package node
 
 import (
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 )
 

cli/command/node/cmd.go

@@ -3,10 +3,10 @@ package node
 import (
 	"errors"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	apiclient "github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	apiclient "github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/node/demote.go

@@ -3,9 +3,9 @@ package node
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/node/demote_test.go

@@ -5,11 +5,11 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/internal/test"
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 )

cli/command/node/inspect.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/node/inspect_test.go

@@ -6,12 +6,12 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/internal/test"
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/docker/docker/pkg/testutil/golden"
 	"github.com/stretchr/testify/assert"

cli/command/node/list.go

@@ -3,10 +3,10 @@ package node
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )

cli/command/node/list_test.go

@@ -5,13 +5,13 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/docker/cli/cli/config/configfile"
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/config/configfile"
-	"github.com/docker/docker/cli/internal/test"
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/stretchr/testify/assert"
 )
 

cli/command/node/promote.go

@@ -3,9 +3,9 @@ package node
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/node/promote_test.go

@@ -5,11 +5,11 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/internal/test"
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 )

cli/command/node/ps.go

@@ -3,13 +3,13 @@ package node
 import (
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
+	"github.com/docker/cli/cli/command/idresolver"
+	"github.com/docker/cli/cli/command/task"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/cli/command/idresolver"
-	"github.com/docker/docker/cli/command/task"
 	"github.com/docker/docker/opts"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/node/ps_test.go

@@ -7,12 +7,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/internal/test"
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/docker/docker/pkg/testutil/golden"
 	"github.com/stretchr/testify/assert"

cli/command/node/remove.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cli/command/node/remove_test.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/docker/docker/cli/internal/test"
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"

cli/command/node/update.go

@@ -3,9 +3,9 @@ package node
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/pkg/errors"

cli/command/node/update_test.go

@@ -5,11 +5,11 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/docker/cli/cli/internal/test"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/internal/test"
 	"github.com/pkg/errors"
 	// Import builders to get the builder function as package function
-	. "github.com/docker/docker/cli/internal/test/builders"
+	. "github.com/docker/cli/cli/internal/test/builders"
 	"github.com/docker/docker/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 )

cli/command/plugin/cmd.go

@@ -1,8 +1,8 @@
 package plugin
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/plugin/create.go

@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/plugin/disable.go

@@ -3,9 +3,9 @@ package plugin
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/plugin/enable.go

@@ -3,9 +3,9 @@ package plugin
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/plugin/inspect.go

@@ -1,9 +1,9 @@
 package plugin
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/inspect"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/plugin/install.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/image"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/registry"
 	"github.com/pkg/errors"

cli/command/plugin/list.go

@@ -1,9 +1,9 @@
 package plugin
 
 import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"

cli/command/plugin/push.go

@@ -3,10 +3,10 @@ package plugin
 import (
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/image"
 	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/registry"
 	"github.com/pkg/errors"

cli/command/plugin/remove.go

@@ -3,9 +3,9 @@ package plugin
 import (
 	"fmt"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )

cli/command/plugin/set.go

@@ -3,8 +3,8 @@ package plugin
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
 )
 

cli/command/plugin/upgrade.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/prune/prune.go

@@ -1,11 +1,11 @@
 package prune
 
 import (
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/container"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/cli/command/network"
-	"github.com/docker/docker/cli/command/volume"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/command/container"
+	"github.com/docker/cli/cli/command/image"
+	"github.com/docker/cli/cli/command/network"
+	"github.com/docker/cli/cli/command/volume"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )

cli/command/registry/login.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/registry"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cli/command/registry/logout.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/registry"
 	"github.com/spf13/cobra"
 )

cli/command/registry/search.go

@@ -8,10 +8,10 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
 	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/docker/docker/registry"

cli/command/secret/client_test.go

@@ -1,9 +1,9 @@
 package secret
 
 import (
+	"github.com/docker/cli/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 )
 

cli/command/secret/cmd.go

@@ -3,8 +3,8 @@ package secret
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 )
 
 // NewSecretCommand returns a cobra command for `secret` subcommands

cli/command/secret/create.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"io/ioutil"
 
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/system"
 	runconfigopts "github.com/docker/docker/runconfig/opts"