diff --git a/cli/command/checkpoint/cmd.go b/cli/command/checkpoint/cmd.go index d5705a4dad..f748dd72f1 100644 --- a/cli/command/checkpoint/cmd.go +++ b/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" ) diff --git a/cli/command/checkpoint/create.go b/cli/command/checkpoint/create.go index 473a941733..cdcd3220bc 100644 --- a/cli/command/checkpoint/create.go +++ b/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" ) diff --git a/cli/command/checkpoint/list.go b/cli/command/checkpoint/list.go index 20e7d6d73a..6c560a9a1b 100644 --- a/cli/command/checkpoint/list.go +++ b/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" ) diff --git a/cli/command/checkpoint/remove.go b/cli/command/checkpoint/remove.go index ec39fa7b55..4fbf763c8b 100644 --- a/cli/command/checkpoint/remove.go +++ b/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" ) diff --git a/cli/command/cli.go b/cli/command/cli.go index 45752d7d55..c5541978c2 100644 --- a/cli/command/cli.go +++ b/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" diff --git a/cli/command/commands/commands.go b/cli/command/commands/commands.go index 0db7f3a409..a4c00eee24 100644 --- a/cli/command/commands/commands.go +++ b/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" ) diff --git a/cli/command/container/attach.go b/cli/command/container/attach.go index 0564bdcd0f..f86b33a8ca 100644 --- a/cli/command/container/attach.go +++ b/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" diff --git a/cli/command/container/cmd.go b/cli/command/container/cmd.go index b78411e0a3..ebcb2d504c 100644 --- a/cli/command/container/cmd.go +++ b/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" ) diff --git a/cli/command/container/commit.go b/cli/command/container/commit.go index 8f67d96d87..70b79dcc22 100644 --- a/cli/command/container/commit.go +++ b/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" diff --git a/cli/command/container/cp.go b/cli/command/container/cp.go index a4165a18d2..17a4030135 100644 --- a/cli/command/container/cp.go +++ b/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" diff --git a/cli/command/container/create.go b/cli/command/container/create.go index 9222b4060b..7556ece98e 100644 --- a/cli/command/container/create.go +++ b/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" diff --git a/cli/command/container/diff.go b/cli/command/container/diff.go index 816a0a56a3..5f646aa962 100644 --- a/cli/command/container/diff.go +++ b/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" diff --git a/cli/command/container/exec.go b/cli/command/container/exec.go index 676708c77b..351fec3cc2 100644 --- a/cli/command/container/exec.go +++ b/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" diff --git a/cli/command/container/export.go b/cli/command/container/export.go index cb0ddfe7a7..4b2c293a6c 100644 --- a/cli/command/container/export.go +++ b/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" diff --git a/cli/command/container/hijack.go b/cli/command/container/hijack.go index 11acf114f0..a119e81b3c 100644 --- a/cli/command/container/hijack.go +++ b/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" ) diff --git a/cli/command/container/inspect.go b/cli/command/container/inspect.go index d08b38dc96..7e0e71034f 100644 --- a/cli/command/container/inspect.go +++ b/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" ) diff --git a/cli/command/container/kill.go b/cli/command/container/kill.go index 4cc3ee0fcb..650f9577ad 100644 --- a/cli/command/container/kill.go +++ b/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" diff --git a/cli/command/container/list.go b/cli/command/container/list.go index e0f4fdf21f..f3752bce61 100644 --- a/cli/command/container/list.go +++ b/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" diff --git a/cli/command/container/logs.go b/cli/command/container/logs.go index d8cafaf744..209e749425 100644 --- a/cli/command/container/logs.go +++ b/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" diff --git a/cli/command/container/pause.go b/cli/command/container/pause.go index 095a0db2c2..9dc404d78b 100644 --- a/cli/command/container/pause.go +++ b/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" diff --git a/cli/command/container/port.go b/cli/command/container/port.go index 2793f6bc6b..13a1ae4231 100644 --- a/cli/command/container/port.go +++ b/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" diff --git a/cli/command/container/prune.go b/cli/command/container/prune.go index cf12dc71fe..8cc81929e1 100644 --- a/cli/command/container/prune.go +++ b/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" diff --git a/cli/command/container/rename.go b/cli/command/container/rename.go index 07b4852f47..ad60bda3b2 100644 --- a/cli/command/container/rename.go +++ b/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" diff --git a/cli/command/container/restart.go b/cli/command/container/restart.go index 73cd2507ee..6e13603667 100644 --- a/cli/command/container/restart.go +++ b/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" diff --git a/cli/command/container/rm.go b/cli/command/container/rm.go index 887b5c5d34..a7106acce1 100644 --- a/cli/command/container/rm.go +++ b/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" diff --git a/cli/command/container/run.go b/cli/command/container/run.go index bab6a9cf13..c6b85059df 100644 --- a/cli/command/container/run.go +++ b/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" diff --git a/cli/command/container/start.go b/cli/command/container/start.go index 7702cd4a75..e6e5b595b1 100644 --- a/cli/command/container/start.go +++ b/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" diff --git a/cli/command/container/stats.go b/cli/command/container/stats.go index c420e8151e..2b01367fb3 100644 --- a/cli/command/container/stats.go +++ b/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" diff --git a/cli/command/container/stats_helpers.go b/cli/command/container/stats_helpers.go index 5cbcf03e40..4df1624a73 100644 --- a/cli/command/container/stats_helpers.go +++ b/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" ) diff --git a/cli/command/container/stop.go b/cli/command/container/stop.go index 32729e1eae..59d6d0b703 100644 --- a/cli/command/container/stop.go +++ b/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" diff --git a/cli/command/container/top.go b/cli/command/container/top.go index 4a6d3ed5cf..428ee27ffb 100644 --- a/cli/command/container/top.go +++ b/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" ) diff --git a/cli/command/container/tty.go b/cli/command/container/tty.go index 6af8e2becf..dba519ef91 100644 --- a/cli/command/container/tty.go +++ b/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" ) diff --git a/cli/command/container/unpause.go b/cli/command/container/unpause.go index 8105b17551..b6d5e231b8 100644 --- a/cli/command/container/unpause.go +++ b/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" diff --git a/cli/command/container/update.go b/cli/command/container/update.go index a650815e8e..dd452dc01e 100644 --- a/cli/command/container/update.go +++ b/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" diff --git a/cli/command/container/utils.go b/cli/command/container/utils.go index e4664b745c..e623af38c1 100644 --- a/cli/command/container/utils.go +++ b/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" ) diff --git a/cli/command/container/wait.go b/cli/command/container/wait.go index f978207b94..1deeb59fa2 100644 --- a/cli/command/container/wait.go +++ b/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" diff --git a/cli/command/formatter/node.go b/cli/command/formatter/node.go index 4d7f293f5c..85cf8010a4 100644 --- a/cli/command/formatter/node.go +++ b/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" ) diff --git a/cli/command/formatter/service.go b/cli/command/formatter/service.go index e32704f337..27200b8be9 100644 --- a/cli/command/formatter/service.go +++ b/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" diff --git a/cli/command/formatter/task.go b/cli/command/formatter/task.go index 2c6e7bb124..6172b320ef 100644 --- a/cli/command/formatter/task.go +++ b/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" ) diff --git a/cli/command/idresolver/client_test.go b/cli/command/idresolver/client_test.go index f84683b907..7a13609421 100644 --- a/cli/command/idresolver/client_test.go +++ b/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" ) diff --git a/cli/command/idresolver/idresolver.go b/cli/command/idresolver/idresolver.go index 6088b64b59..f79d8a11fc 100644 --- a/cli/command/idresolver/idresolver.go +++ b/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" ) diff --git a/cli/command/idresolver/idresolver_test.go b/cli/command/idresolver/idresolver_test.go index 1aca09ce96..f740c13eff 100644 --- a/cli/command/idresolver/idresolver_test.go +++ b/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" diff --git a/cli/command/image/build.go b/cli/command/image/build.go index 27fe83c524..88f9405957 100644 --- a/cli/command/image/build.go +++ b/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" diff --git a/cli/command/image/cmd.go b/cli/command/image/cmd.go index c3ca61f85b..cb079174d1 100644 --- a/cli/command/image/cmd.go +++ b/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 diff --git a/cli/command/image/history.go b/cli/command/image/history.go index 4d964b4d40..f4a7009f7c 100644 --- a/cli/command/image/history.go +++ b/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" ) diff --git a/cli/command/image/import.go b/cli/command/image/import.go index 60024fb53c..5284b66e26 100644 --- a/cli/command/image/import.go +++ b/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" diff --git a/cli/command/image/inspect.go b/cli/command/image/inspect.go index 217863c772..5d805fcfd5 100644 --- a/cli/command/image/inspect.go +++ b/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" ) diff --git a/cli/command/image/list.go b/cli/command/image/list.go index 679604fc02..86364489eb 100644 --- a/cli/command/image/list.go +++ b/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" ) diff --git a/cli/command/image/load.go b/cli/command/image/load.go index 24346f126b..f4b6b4490e 100644 --- a/cli/command/image/load.go +++ b/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" diff --git a/cli/command/image/prune.go b/cli/command/image/prune.go index f86bae39cc..a60ce2080a 100644 --- a/cli/command/image/prune.go +++ b/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" diff --git a/cli/command/image/pull.go b/cli/command/image/pull.go index 5dd523c6d1..c4be52fe8a 100644 --- a/cli/command/image/pull.go +++ b/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" diff --git a/cli/command/image/push.go b/cli/command/image/push.go index 3879d849dd..00b3d96f04 100644 --- a/cli/command/image/push.go +++ b/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" diff --git a/cli/command/image/remove.go b/cli/command/image/remove.go index 48e8d2c2ac..0948bb7bef 100644 --- a/cli/command/image/remove.go +++ b/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" ) diff --git a/cli/command/image/save.go b/cli/command/image/save.go index e01d2c7302..37325edead 100644 --- a/cli/command/image/save.go +++ b/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" diff --git a/cli/command/image/tag.go b/cli/command/image/tag.go index fb2b703856..ab8dc72498 100644 --- a/cli/command/image/tag.go +++ b/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" ) diff --git a/cli/command/image/trust.go b/cli/command/image/trust.go index 75bae2eb53..9f0f6c70d4 100644 --- a/cli/command/image/trust.go +++ b/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" diff --git a/cli/command/image/trust_test.go b/cli/command/image/trust_test.go index 78146465e6..0a57f9b3bf 100644 --- a/cli/command/image/trust_test.go +++ b/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" ) diff --git a/cli/command/inspect/inspector.go b/cli/command/inspect/inspector.go index 13e584ab49..62a24ff369 100644 --- a/cli/command/inspect/inspector.go +++ b/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" ) diff --git a/cli/command/network/cmd.go b/cli/command/network/cmd.go index ab8393cded..da695f8a5c 100644 --- a/cli/command/network/cmd.go +++ b/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 diff --git a/cli/command/network/connect.go b/cli/command/network/connect.go index bc90ddaba7..813a8e3536 100644 --- a/cli/command/network/connect.go +++ b/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" ) diff --git a/cli/command/network/create.go b/cli/command/network/create.go index 90119af919..3a18aa9d7e 100644 --- a/cli/command/network/create.go +++ b/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" diff --git a/cli/command/network/disconnect.go b/cli/command/network/disconnect.go index c9d9c14a13..0f7d7c2b98 100644 --- a/cli/command/network/disconnect.go +++ b/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" ) diff --git a/cli/command/network/inspect.go b/cli/command/network/inspect.go index e58d66b77a..0c76e87351 100644 --- a/cli/command/network/inspect.go +++ b/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" ) diff --git a/cli/command/network/list.go b/cli/command/network/list.go index 1a5d285103..a35f32f147 100644 --- a/cli/command/network/list.go +++ b/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" ) diff --git a/cli/command/network/prune.go b/cli/command/network/prune.go index ec363ab914..6a0f639e9f 100644 --- a/cli/command/network/prune.go +++ b/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" ) diff --git a/cli/command/network/remove.go b/cli/command/network/remove.go index b5f074a981..c83016a408 100644 --- a/cli/command/network/remove.go +++ b/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" ) diff --git a/cli/command/node/client_test.go b/cli/command/node/client_test.go index 1f5cdc7cee..a0c8e53743 100644 --- a/cli/command/node/client_test.go +++ b/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" ) diff --git a/cli/command/node/cmd.go b/cli/command/node/cmd.go index ea8b40a9a6..0462274a89 100644 --- a/cli/command/node/cmd.go +++ b/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" ) diff --git a/cli/command/node/demote.go b/cli/command/node/demote.go index 72ed3ea630..5250dfc0be 100644 --- a/cli/command/node/demote.go +++ b/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" ) diff --git a/cli/command/node/demote_test.go b/cli/command/node/demote_test.go index 803b9c229b..7126dddd13 100644 --- a/cli/command/node/demote_test.go +++ b/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" ) diff --git a/cli/command/node/inspect.go b/cli/command/node/inspect.go index 39b90bb72e..ffb4efe459 100644 --- a/cli/command/node/inspect.go +++ b/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" ) diff --git a/cli/command/node/inspect_test.go b/cli/command/node/inspect_test.go index 95b45d51e9..2a21e12a28 100644 --- a/cli/command/node/inspect_test.go +++ b/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" diff --git a/cli/command/node/list.go b/cli/command/node/list.go index 9c6224dd19..e2912b186a 100644 --- a/cli/command/node/list.go +++ b/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" ) diff --git a/cli/command/node/list_test.go b/cli/command/node/list_test.go index af2d6be156..c4538ba141 100644 --- a/cli/command/node/list_test.go +++ b/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" ) diff --git a/cli/command/node/promote.go b/cli/command/node/promote.go index 94fff6400b..4612cc13ff 100644 --- a/cli/command/node/promote.go +++ b/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" ) diff --git a/cli/command/node/promote_test.go b/cli/command/node/promote_test.go index ce2fb13dca..495bdfe60d 100644 --- a/cli/command/node/promote_test.go +++ b/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" ) diff --git a/cli/command/node/ps.go b/cli/command/node/ps.go index 0ab1c0b9f4..0e1aa6bd41 100644 --- a/cli/command/node/ps.go +++ b/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" diff --git a/cli/command/node/ps_test.go b/cli/command/node/ps_test.go index f604628991..ddc0eba0d4 100644 --- a/cli/command/node/ps_test.go +++ b/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" diff --git a/cli/command/node/remove.go b/cli/command/node/remove.go index bd429ee45f..d23ec2fb5c 100644 --- a/cli/command/node/remove.go +++ b/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" ) diff --git a/cli/command/node/remove_test.go b/cli/command/node/remove_test.go index b53431dfa7..7123288f47 100644 --- a/cli/command/node/remove_test.go +++ b/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" diff --git a/cli/command/node/update.go b/cli/command/node/update.go index 82668595a7..0503044da5 100644 --- a/cli/command/node/update.go +++ b/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" diff --git a/cli/command/node/update_test.go b/cli/command/node/update_test.go index a5e2d20e9a..0085934b9c 100644 --- a/cli/command/node/update_test.go +++ b/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" ) diff --git a/cli/command/plugin/cmd.go b/cli/command/plugin/cmd.go index 33046d2cb8..a70f8705ca 100644 --- a/cli/command/plugin/cmd.go +++ b/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" ) diff --git a/cli/command/plugin/create.go b/cli/command/plugin/create.go index b51f1933db..5184ce1da5 100644 --- a/cli/command/plugin/create.go +++ b/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" diff --git a/cli/command/plugin/disable.go b/cli/command/plugin/disable.go index 07b0ec2288..1ab33ccf82 100644 --- a/cli/command/plugin/disable.go +++ b/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" ) diff --git a/cli/command/plugin/enable.go b/cli/command/plugin/enable.go index b1ca48f8f1..53a7acd0c2 100644 --- a/cli/command/plugin/enable.go +++ b/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" diff --git a/cli/command/plugin/inspect.go b/cli/command/plugin/inspect.go index c2c7a0d6bc..00ae300d57 100644 --- a/cli/command/plugin/inspect.go +++ b/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" ) diff --git a/cli/command/plugin/install.go b/cli/command/plugin/install.go index 18b3fa3739..85fd8bad5f 100644 --- a/cli/command/plugin/install.go +++ b/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" diff --git a/cli/command/plugin/list.go b/cli/command/plugin/list.go index a1b231f570..5e9c69d214 100644 --- a/cli/command/plugin/list.go +++ b/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" diff --git a/cli/command/plugin/push.go b/cli/command/plugin/push.go index de4f95cce8..50ba3d610d 100644 --- a/cli/command/plugin/push.go +++ b/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" diff --git a/cli/command/plugin/remove.go b/cli/command/plugin/remove.go index 9f3aba9a01..32211147e7 100644 --- a/cli/command/plugin/remove.go +++ b/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" ) diff --git a/cli/command/plugin/set.go b/cli/command/plugin/set.go index 52b09fb500..7a69995cdb 100644 --- a/cli/command/plugin/set.go +++ b/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" ) diff --git a/cli/command/plugin/upgrade.go b/cli/command/plugin/upgrade.go index cbcbe17ece..0e3f56ff62 100644 --- a/cli/command/plugin/upgrade.go +++ b/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" diff --git a/cli/command/prune/prune.go b/cli/command/prune/prune.go index 26153ed7c1..37852e6dee 100644 --- a/cli/command/prune/prune.go +++ b/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" ) diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index 343d107dc2..e7799ae746 100644 --- a/cli/command/registry/login.go +++ b/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" diff --git a/cli/command/registry/logout.go b/cli/command/registry/logout.go index f1f397fa08..eba303acf0 100644 --- a/cli/command/registry/logout.go +++ b/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" ) diff --git a/cli/command/registry/search.go b/cli/command/registry/search.go index f534082d32..131e4f73f1 100644 --- a/cli/command/registry/search.go +++ b/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" diff --git a/cli/command/secret/client_test.go b/cli/command/secret/client_test.go index bb4b412fc2..1620fada16 100644 --- a/cli/command/secret/client_test.go +++ b/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" ) diff --git a/cli/command/secret/cmd.go b/cli/command/secret/cmd.go index acaef4dcac..a8f85e03cf 100644 --- a/cli/command/secret/cmd.go +++ b/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 diff --git a/cli/command/secret/create.go b/cli/command/secret/create.go index 59b0798178..b52c73eff5 100644 --- a/cli/command/secret/create.go +++ b/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" diff --git a/cli/command/secret/create_test.go b/cli/command/secret/create_test.go index 0e9c1cd4af..cc77fd7fac 100644 --- a/cli/command/secret/create_test.go +++ b/cli/command/secret/create_test.go @@ -7,9 +7,9 @@ import ( "strings" "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/docker/docker/pkg/testutil" "github.com/docker/docker/pkg/testutil/golden" "github.com/pkg/errors" diff --git a/cli/command/secret/inspect.go b/cli/command/secret/inspect.go index 8b3c3c682e..744da735c6 100644 --- a/cli/command/secret/inspect.go +++ b/cli/command/secret/inspect.go @@ -1,9 +1,9 @@ package secret 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" ) diff --git a/cli/command/secret/inspect_test.go b/cli/command/secret/inspect_test.go index 52b9a1cef0..29ac5bb8d5 100644 --- a/cli/command/secret/inspect_test.go +++ b/cli/command/secret/inspect_test.go @@ -6,11 +6,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/docker/docker/pkg/testutil/golden" "github.com/stretchr/testify/assert" diff --git a/cli/command/secret/ls.go b/cli/command/secret/ls.go index 384ee26509..b63e06f50c 100644 --- a/cli/command/secret/ls.go +++ b/cli/command/secret/ls.go @@ -1,10 +1,10 @@ package secret import ( + "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" "golang.org/x/net/context" diff --git a/cli/command/secret/ls_test.go b/cli/command/secret/ls_test.go index cb0510adff..5d2103cb2a 100644 --- a/cli/command/secret/ls_test.go +++ b/cli/command/secret/ls_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" + "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/docker/docker/pkg/testutil" "github.com/docker/docker/pkg/testutil/golden" "github.com/stretchr/testify/assert" diff --git a/cli/command/secret/remove.go b/cli/command/secret/remove.go index a4b501d176..969b9ceb75 100644 --- a/cli/command/secret/remove.go +++ b/cli/command/secret/remove.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" diff --git a/cli/command/secret/remove_test.go b/cli/command/secret/remove_test.go index b8bbb5e6f5..b6085c9890 100644 --- a/cli/command/secret/remove_test.go +++ b/cli/command/secret/remove_test.go @@ -6,7 +6,7 @@ import ( "strings" "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" diff --git a/cli/command/service/cmd.go b/cli/command/service/cmd.go index 51208b80c2..1c2bc85803 100644 --- a/cli/command/service/cmd.go +++ b/cli/command/service/cmd.go @@ -3,8 +3,8 @@ package service 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" ) // NewServiceCommand returns a cobra command for `service` subcommands diff --git a/cli/command/service/create.go b/cli/command/service/create.go index bb2a1fe3b7..a9400ad38d 100644 --- a/cli/command/service/create.go +++ b/cli/command/service/create.go @@ -3,9 +3,9 @@ package service 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" "github.com/spf13/pflag" "golang.org/x/net/context" diff --git a/cli/command/service/helpers.go b/cli/command/service/helpers.go index 2289369908..50aee7c88f 100644 --- a/cli/command/service/helpers.go +++ b/cli/command/service/helpers.go @@ -3,8 +3,8 @@ package service import ( "io" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/command/service/progress" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/command/service/progress" "github.com/docker/docker/pkg/jsonmessage" "golang.org/x/net/context" ) diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go index fae24eeaf1..34c623789c 100644 --- a/cli/command/service/inspect.go +++ b/cli/command/service/inspect.go @@ -5,11 +5,11 @@ import ( "golang.org/x/net/context" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/command/formatter" + apiclient "github.com/docker/cli/client" "github.com/docker/docker/api/types" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/command/formatter" - apiclient "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cli/command/service/inspect_test.go b/cli/command/service/inspect_test.go index c5bda7dcd9..c2984a787a 100644 --- a/cli/command/service/inspect_test.go +++ b/cli/command/service/inspect_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" + "github.com/docker/cli/cli/command/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli/command/formatter" "github.com/stretchr/testify/assert" ) diff --git a/cli/command/service/list.go b/cli/command/service/list.go index 1754297316..18b357129e 100644 --- a/cli/command/service/list.go +++ b/cli/command/service/list.go @@ -3,12 +3,12 @@ package service import ( "fmt" + "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/filters" "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/opts" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/service/logs.go b/cli/command/service/logs.go index 2440c1680e..f64911d7fd 100644 --- a/cli/command/service/logs.go +++ b/cli/command/service/logs.go @@ -9,12 +9,12 @@ import ( "golang.org/x/net/context" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/command/idresolver" + "github.com/docker/cli/client" "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/idresolver" - "github.com/docker/docker/client" "github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go index 4211c5bf8c..ed23a562fe 100644 --- a/cli/command/service/opts.go +++ b/cli/command/service/opts.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "github.com/docker/cli/client" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/client" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/docker/swarmkit/api" diff --git a/cli/command/service/parse.go b/cli/command/service/parse.go index acee08761f..d6f93b044e 100644 --- a/cli/command/service/parse.go +++ b/cli/command/service/parse.go @@ -1,10 +1,10 @@ package service import ( + "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" swarmtypes "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/client" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/cli/command/service/progress/progress.go b/cli/command/service/progress/progress.go index bfeaa314a4..2c2ea98b3f 100644 --- a/cli/command/service/progress/progress.go +++ b/cli/command/service/progress/progress.go @@ -8,10 +8,10 @@ import ( "os/signal" "time" + "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/client" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" "github.com/docker/docker/pkg/stringid" diff --git a/cli/command/service/ps.go b/cli/command/service/ps.go index 2c633c66d0..36ee2eb687 100644 --- a/cli/command/service/ps.go +++ b/cli/command/service/ps.go @@ -5,15 +5,15 @@ 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/cli/cli/command/idresolver" + "github.com/docker/cli/cli/command/node" + "github.com/docker/cli/cli/command/task" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" swarmtypes "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/node" - "github.com/docker/docker/cli/command/task" "github.com/docker/docker/opts" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/service/remove.go b/cli/command/service/remove.go index a7b0107089..bc6a202f64 100644 --- a/cli/command/service/remove.go +++ b/cli/command/service/remove.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" diff --git a/cli/command/service/scale.go b/cli/command/service/scale.go index 98163c87c9..397fe1800c 100644 --- a/cli/command/service/scale.go +++ b/cli/command/service/scale.go @@ -7,9 +7,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" ) diff --git a/cli/command/service/trust.go b/cli/command/service/trust.go index eba52a9dd1..8afe809049 100644 --- a/cli/command/service/trust.go +++ b/cli/command/service/trust.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "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/swarm" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/trust" "github.com/docker/docker/registry" "github.com/docker/notary/tuf/data" "github.com/opencontainers/go-digest" diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 233da68eee..2845086217 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -6,14 +6,14 @@ import ( "strings" "time" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/client" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/docker/go-connections/nat" diff --git a/cli/command/stack/client_test.go b/cli/command/stack/client_test.go index 0cd8612b6d..312e796b22 100644 --- a/cli/command/stack/client_test.go +++ b/cli/command/stack/client_test.go @@ -3,11 +3,11 @@ package stack import ( "strings" + "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli/compose/convert" - "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/stack/cmd.go b/cli/command/stack/cmd.go index 860bfedd1a..1a03be8f85 100644 --- a/cli/command/stack/cmd.go +++ b/cli/command/stack/cmd.go @@ -1,8 +1,8 @@ package stack 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" ) diff --git a/cli/command/stack/common.go b/cli/command/stack/common.go index e69e3fa908..443ca3297d 100644 --- a/cli/command/stack/common.go +++ b/cli/command/stack/common.go @@ -3,11 +3,11 @@ package stack import ( "golang.org/x/net/context" + "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli/compose/convert" - "github.com/docker/docker/client" "github.com/docker/docker/opts" ) diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go index 6789171702..1bef0e7f4a 100644 --- a/cli/command/stack/deploy.go +++ b/cli/command/stack/deploy.go @@ -3,10 +3,10 @@ package stack import ( "fmt" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/compose/convert" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/compose/convert" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/stack/deploy_bundlefile.go b/cli/command/stack/deploy_bundlefile.go index 0f8f8d040b..daf6ae5aeb 100644 --- a/cli/command/stack/deploy_bundlefile.go +++ b/cli/command/stack/deploy_bundlefile.go @@ -3,10 +3,10 @@ package stack import ( "golang.org/x/net/context" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/compose/convert" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/compose/convert" ) func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deployOptions) error { diff --git a/cli/command/stack/deploy_composefile.go b/cli/command/stack/deploy_composefile.go index 10963d1844..f241310bf2 100644 --- a/cli/command/stack/deploy_composefile.go +++ b/cli/command/stack/deploy_composefile.go @@ -7,14 +7,14 @@ import ( "sort" "strings" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/cli/compose/loader" + composetypes "github.com/docker/cli/cli/compose/types" + apiclient "github.com/docker/cli/client" + dockerclient "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/compose/convert" - "github.com/docker/docker/cli/compose/loader" - composetypes "github.com/docker/docker/cli/compose/types" - apiclient "github.com/docker/docker/client" - dockerclient "github.com/docker/docker/client" "github.com/pkg/errors" "golang.org/x/net/context" ) diff --git a/cli/command/stack/deploy_test.go b/cli/command/stack/deploy_test.go index 817c06dd04..ffdd759699 100644 --- a/cli/command/stack/deploy_test.go +++ b/cli/command/stack/deploy_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/docker/docker/cli/compose/convert" - "github.com/docker/docker/cli/internal/test" + "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/cli/internal/test" "github.com/stretchr/testify/assert" "golang.org/x/net/context" ) diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go index f27d5009ed..7b1f8e3559 100644 --- a/cli/command/stack/list.go +++ b/cli/command/stack/list.go @@ -7,11 +7,11 @@ import ( "strconv" "text/tabwriter" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/compose/convert" + "github.com/docker/cli/client" "github.com/docker/docker/api/types" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/compose/convert" - "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/stack/opts.go b/cli/command/stack/opts.go index 0d7214e962..c1634e26be 100644 --- a/cli/command/stack/opts.go +++ b/cli/command/stack/opts.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/docker/docker/cli/command/bundlefile" + "github.com/docker/cli/cli/command/bundlefile" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/cli/command/stack/ps.go b/cli/command/stack/ps.go index bac5307bd1..a09e7fa8a8 100644 --- a/cli/command/stack/ps.go +++ b/cli/command/stack/ps.go @@ -5,12 +5,12 @@ 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/cli/cli/command/idresolver" + "github.com/docker/cli/cli/command/task" "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/cli/command/idresolver" - "github.com/docker/docker/cli/command/task" "github.com/docker/docker/opts" "github.com/spf13/cobra" ) diff --git a/cli/command/stack/remove.go b/cli/command/stack/remove.go index 7df4e4c0ed..27258850d2 100644 --- a/cli/command/stack/remove.go +++ b/cli/command/stack/remove.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" "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/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/stack/remove_test.go b/cli/command/stack/remove_test.go index 17a334db1e..a2be8c5f4c 100644 --- a/cli/command/stack/remove_test.go +++ b/cli/command/stack/remove_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/docker/docker/cli/internal/test" + "github.com/docker/cli/cli/internal/test" "github.com/stretchr/testify/assert" ) diff --git a/cli/command/stack/services.go b/cli/command/stack/services.go index 78ddd399ce..f42f448a6f 100644 --- a/cli/command/stack/services.go +++ b/cli/command/stack/services.go @@ -5,12 +5,12 @@ 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/cli/cli/command/service" "github.com/docker/docker/api/types" "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/docker/docker/cli/command/service" "github.com/docker/docker/opts" "github.com/spf13/cobra" ) diff --git a/cli/command/swarm/client_test.go b/cli/command/swarm/client_test.go index 1d42b9499c..c6552c8081 100644 --- a/cli/command/swarm/client_test.go +++ b/cli/command/swarm/client_test.go @@ -1,9 +1,9 @@ package swarm 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" ) diff --git a/cli/command/swarm/cmd.go b/cli/command/swarm/cmd.go index 659dbcdf7b..7943a8323a 100644 --- a/cli/command/swarm/cmd.go +++ b/cli/command/swarm/cmd.go @@ -3,8 +3,8 @@ package swarm 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" ) // NewSwarmCommand returns a cobra command for `swarm` subcommands diff --git a/cli/command/swarm/init.go b/cli/command/swarm/init.go index 37d96de113..e64a2c5ae6 100644 --- a/cli/command/swarm/init.go +++ b/cli/command/swarm/init.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/swarm" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cli/command/swarm/init_test.go b/cli/command/swarm/init_test.go index 39cb73888c..0fcdbb786d 100644 --- a/cli/command/swarm/init_test.go +++ b/cli/command/swarm/init_test.go @@ -6,9 +6,9 @@ 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/docker/docker/pkg/testutil" "github.com/docker/docker/pkg/testutil/golden" "github.com/pkg/errors" diff --git a/cli/command/swarm/join.go b/cli/command/swarm/join.go index 873eaaefaa..ff4351c52e 100644 --- a/cli/command/swarm/join.go +++ b/cli/command/swarm/join.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/swarm" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cli/command/swarm/join_test.go b/cli/command/swarm/join_test.go index 6893f68e1d..d4f1098ff9 100644 --- a/cli/command/swarm/join_test.go +++ b/cli/command/swarm/join_test.go @@ -6,9 +6,9 @@ import ( "strings" "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/docker/docker/pkg/testutil" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/cli/command/swarm/join_token.go b/cli/command/swarm/join_token.go index dc69e909e0..0a905dfc26 100644 --- a/cli/command/swarm/join_token.go +++ b/cli/command/swarm/join_token.go @@ -3,9 +3,9 @@ package swarm 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/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/swarm/join_token_test.go b/cli/command/swarm/join_token_test.go index 9289189009..5c095b4156 100644 --- a/cli/command/swarm/join_token_test.go +++ b/cli/command/swarm/join_token_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" diff --git a/cli/command/swarm/leave.go b/cli/command/swarm/leave.go index 128ed46d8a..c9b33fd0de 100644 --- a/cli/command/swarm/leave.go +++ b/cli/command/swarm/leave.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" ) diff --git a/cli/command/swarm/leave_test.go b/cli/command/swarm/leave_test.go index 030f18039a..dd7597efb5 100644 --- a/cli/command/swarm/leave_test.go +++ b/cli/command/swarm/leave_test.go @@ -6,7 +6,7 @@ import ( "strings" "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" diff --git a/cli/command/swarm/unlock.go b/cli/command/swarm/unlock.go index c1d9b99189..dd999a7f4b 100644 --- a/cli/command/swarm/unlock.go +++ b/cli/command/swarm/unlock.go @@ -6,9 +6,9 @@ import ( "io" "strings" + "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/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cli/command/swarm/unlock_key.go b/cli/command/swarm/unlock_key.go index 77c97d88ea..3fd9d26f7f 100644 --- a/cli/command/swarm/unlock_key.go +++ b/cli/command/swarm/unlock_key.go @@ -3,9 +3,9 @@ package swarm 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/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/swarm/unlock_key_test.go b/cli/command/swarm/unlock_key_test.go index 23752104aa..6b0246b199 100644 --- a/cli/command/swarm/unlock_key_test.go +++ b/cli/command/swarm/unlock_key_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" diff --git a/cli/command/swarm/unlock_test.go b/cli/command/swarm/unlock_test.go index e1a2bb4cc5..0bd433671d 100644 --- a/cli/command/swarm/unlock_test.go +++ b/cli/command/swarm/unlock_test.go @@ -6,9 +6,9 @@ import ( "strings" "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/docker/docker/pkg/testutil" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/cli/command/swarm/update.go b/cli/command/swarm/update.go index 1ccd268e74..561ca0a768 100644 --- a/cli/command/swarm/update.go +++ b/cli/command/swarm/update.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/swarm" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cli/command/swarm/update_test.go b/cli/command/swarm/update_test.go index 65366ddd20..a6372cfee9 100644 --- a/cli/command/swarm/update_test.go +++ b/cli/command/swarm/update_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" diff --git a/cli/command/system/cmd.go b/cli/command/system/cmd.go index ab3beb895a..d7a47a8ee5 100644 --- a/cli/command/system/cmd.go +++ b/cli/command/system/cmd.go @@ -3,8 +3,8 @@ package system 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" ) // NewSystemCommand returns a cobra command for `system` subcommands diff --git a/cli/command/system/df.go b/cli/command/system/df.go index 67b3b31d87..44c662e380 100644 --- a/cli/command/system/df.go +++ b/cli/command/system/df.go @@ -3,9 +3,9 @@ package system import ( "errors" - "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" ) diff --git a/cli/command/system/events.go b/cli/command/system/events.go index 441ef91d33..17378d1e4c 100644 --- a/cli/command/system/events.go +++ b/cli/command/system/events.go @@ -11,10 +11,10 @@ import ( "golang.org/x/net/context" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" "github.com/docker/docker/api/types" eventtypes "github.com/docker/docker/api/types/events" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" "github.com/docker/docker/opts" "github.com/docker/docker/pkg/jsonlog" "github.com/docker/docker/pkg/templates" diff --git a/cli/command/system/info.go b/cli/command/system/info.go index 8498dd8c55..c37584bd42 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -6,11 +6,11 @@ import ( "strings" "time" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/debug" "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/debug" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/templates" "github.com/docker/go-units" diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go index ad23d35a09..ef5f7a8b05 100644 --- a/cli/command/system/inspect.go +++ b/cli/command/system/inspect.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/inspect" + apiclient "github.com/docker/cli/client" "github.com/docker/docker/api/types" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/command/inspect" - apiclient "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cli/command/system/prune.go b/cli/command/system/prune.go index 46e4316f4a..1a7898f4bf 100644 --- a/cli/command/system/prune.go +++ b/cli/command/system/prune.go @@ -3,9 +3,9 @@ package system import ( "fmt" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/command/prune" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/command/prune" "github.com/docker/docker/opts" units "github.com/docker/go-units" "github.com/spf13/cobra" diff --git a/cli/command/system/version.go b/cli/command/system/version.go index 468db7d03a..e046527c5a 100644 --- a/cli/command/system/version.go +++ b/cli/command/system/version.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/docker/docker/dockerversion" "github.com/docker/docker/pkg/templates" "github.com/spf13/cobra" diff --git a/cli/command/task/print.go b/cli/command/task/print.go index 3df3b2985a..5b96854ffe 100644 --- a/cli/command/task/print.go +++ b/cli/command/task/print.go @@ -6,10 +6,10 @@ import ( "golang.org/x/net/context" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/command/formatter" + "github.com/docker/cli/cli/command/idresolver" "github.com/docker/docker/api/types/swarm" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/command/formatter" - "github.com/docker/docker/cli/command/idresolver" ) type tasksBySlot []swarm.Task diff --git a/cli/command/volume/client_test.go b/cli/command/volume/client_test.go index c29655cdb0..71500d1f03 100644 --- a/cli/command/volume/client_test.go +++ b/cli/command/volume/client_test.go @@ -1,10 +1,10 @@ package volume import ( + "github.com/docker/cli/client" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" - "github.com/docker/docker/client" "golang.org/x/net/context" ) diff --git a/cli/command/volume/cmd.go b/cli/command/volume/cmd.go index 9086c99248..00e1a925b4 100644 --- a/cli/command/volume/cmd.go +++ b/cli/command/volume/cmd.go @@ -1,8 +1,8 @@ package volume 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" ) diff --git a/cli/command/volume/create.go b/cli/command/volume/create.go index 8392cf0029..3b756227c1 100644 --- a/cli/command/volume/create.go +++ b/cli/command/volume/create.go @@ -3,9 +3,9 @@ package volume import ( "fmt" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" volumetypes "github.com/docker/docker/api/types/volume" - "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" diff --git a/cli/command/volume/create_test.go b/cli/command/volume/create_test.go index 45cf631134..a0ef71ffb0 100644 --- a/cli/command/volume/create_test.go +++ b/cli/command/volume/create_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" + "github.com/docker/cli/cli/internal/test" "github.com/docker/docker/api/types" volumetypes "github.com/docker/docker/api/types/volume" - "github.com/docker/docker/cli/internal/test" "github.com/docker/docker/pkg/testutil" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/cli/command/volume/inspect.go b/cli/command/volume/inspect.go index 70db264951..b8729e21cd 100644 --- a/cli/command/volume/inspect.go +++ b/cli/command/volume/inspect.go @@ -1,9 +1,9 @@ package volume 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" ) diff --git a/cli/command/volume/inspect_test.go b/cli/command/volume/inspect_test.go index bc1b526440..3c16f125ab 100644 --- a/cli/command/volume/inspect_test.go +++ b/cli/command/volume/inspect_test.go @@ -6,11 +6,11 @@ import ( "io/ioutil" "testing" + "github.com/docker/cli/cli/internal/test" "github.com/docker/docker/api/types" - "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" diff --git a/cli/command/volume/list.go b/cli/command/volume/list.go index 3577db9554..63dae8402d 100644 --- a/cli/command/volume/list.go +++ b/cli/command/volume/list.go @@ -3,10 +3,10 @@ package volume import ( "sort" + "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" "golang.org/x/net/context" diff --git a/cli/command/volume/list_test.go b/cli/command/volume/list_test.go index 4f5e99389f..2dc11a8b8e 100644 --- a/cli/command/volume/list_test.go +++ b/cli/command/volume/list_test.go @@ -5,14 +5,14 @@ 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/filters" volumetypes "github.com/docker/docker/api/types/volume" - "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/docker/docker/pkg/testutil" "github.com/docker/docker/pkg/testutil/golden" "github.com/stretchr/testify/assert" diff --git a/cli/command/volume/prune.go b/cli/command/volume/prune.go index f7d823ffac..7e33ef91dd 100644 --- a/cli/command/volume/prune.go +++ b/cli/command/volume/prune.go @@ -3,8 +3,8 @@ package volume 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" diff --git a/cli/command/volume/prune_test.go b/cli/command/volume/prune_test.go index 05da9bdded..2381a41458 100644 --- a/cli/command/volume/prune_test.go +++ b/cli/command/volume/prune_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "github.com/docker/cli/cli/internal/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - "github.com/docker/docker/cli/internal/test" "github.com/docker/docker/pkg/testutil" "github.com/docker/docker/pkg/testutil/golden" "github.com/pkg/errors" diff --git a/cli/command/volume/remove.go b/cli/command/volume/remove.go index 683fe8139b..b9d455da6a 100644 --- a/cli/command/volume/remove.go +++ b/cli/command/volume/remove.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" diff --git a/cli/command/volume/remove_test.go b/cli/command/volume/remove_test.go index 5a4dc1f4b7..8916700cc6 100644 --- a/cli/command/volume/remove_test.go +++ b/cli/command/volume/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" diff --git a/cli/compose/convert/compose.go b/cli/compose/convert/compose.go index d7208bfc5d..e0c6bbf81d 100644 --- a/cli/compose/convert/compose.go +++ b/cli/compose/convert/compose.go @@ -4,10 +4,10 @@ import ( "io/ioutil" "strings" + composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types" networktypes "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/swarm" - composetypes "github.com/docker/docker/cli/compose/types" ) const ( diff --git a/cli/compose/convert/compose_test.go b/cli/compose/convert/compose_test.go index a76d5ecd4f..36e48110c8 100644 --- a/cli/compose/convert/compose_test.go +++ b/cli/compose/convert/compose_test.go @@ -3,9 +3,9 @@ package convert import ( "testing" + composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" - composetypes "github.com/docker/docker/cli/compose/types" "github.com/docker/docker/pkg/testutil/tempfile" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go index 11ce70ad6c..932e7543a1 100644 --- a/cli/compose/convert/service.go +++ b/cli/compose/convert/service.go @@ -7,12 +7,12 @@ import ( "strings" "time" + servicecli "github.com/docker/cli/cli/command/service" + composetypes "github.com/docker/cli/cli/compose/types" + "github.com/docker/cli/client" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" - servicecli "github.com/docker/docker/cli/command/service" - composetypes "github.com/docker/docker/cli/compose/types" - "github.com/docker/docker/client" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/pkg/errors" diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go index b08ecf3636..23e423d8f4 100644 --- a/cli/compose/convert/service_test.go +++ b/cli/compose/convert/service_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/swarm" - composetypes "github.com/docker/docker/cli/compose/types" "github.com/stretchr/testify/assert" ) diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go index e759e175fa..e767b07ee9 100644 --- a/cli/compose/convert/volume.go +++ b/cli/compose/convert/volume.go @@ -1,8 +1,8 @@ package convert import ( + composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types/mount" - composetypes "github.com/docker/docker/cli/compose/types" "github.com/pkg/errors" ) diff --git a/cli/compose/convert/volume_test.go b/cli/compose/convert/volume_test.go index a7502d1737..c3d3c1d54e 100644 --- a/cli/compose/convert/volume_test.go +++ b/cli/compose/convert/volume_test.go @@ -3,8 +3,8 @@ package convert import ( "testing" + composetypes "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types/mount" - composetypes "github.com/docker/docker/cli/compose/types" "github.com/stretchr/testify/assert" ) diff --git a/cli/compose/interpolation/interpolation.go b/cli/compose/interpolation/interpolation.go index c8e962b490..ef3263559e 100644 --- a/cli/compose/interpolation/interpolation.go +++ b/cli/compose/interpolation/interpolation.go @@ -1,7 +1,7 @@ package interpolation import ( - "github.com/docker/docker/cli/compose/template" + "github.com/docker/cli/cli/compose/template" "github.com/pkg/errors" ) diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go index 2394ff8e2f..c6d92e4f26 100644 --- a/cli/compose/loader/loader.go +++ b/cli/compose/loader/loader.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/docker/docker/cli/compose/interpolation" - "github.com/docker/docker/cli/compose/schema" - "github.com/docker/docker/cli/compose/template" - "github.com/docker/docker/cli/compose/types" + "github.com/docker/cli/cli/compose/interpolation" + "github.com/docker/cli/cli/compose/schema" + "github.com/docker/cli/cli/compose/template" + "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/opts" runconfigopts "github.com/docker/docker/runconfig/opts" "github.com/docker/go-connections/nat" diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go index 1a120f8b09..15801f2b50 100644 --- a/cli/compose/loader/loader_test.go +++ b/cli/compose/loader/loader_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/docker/docker/cli/compose/types" + "github.com/docker/cli/cli/compose/types" "github.com/stretchr/testify/assert" ) diff --git a/cli/compose/loader/volume.go b/cli/compose/loader/volume.go index 4dce1b2ef5..0b8bc1b063 100644 --- a/cli/compose/loader/volume.go +++ b/cli/compose/loader/volume.go @@ -5,8 +5,8 @@ import ( "unicode" "unicode/utf8" + "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/api/types/mount" - "github.com/docker/docker/cli/compose/types" "github.com/pkg/errors" ) diff --git a/cli/compose/loader/volume_test.go b/cli/compose/loader/volume_test.go index 9b09c13534..79f1667731 100644 --- a/cli/compose/loader/volume_test.go +++ b/cli/compose/loader/volume_test.go @@ -3,7 +3,7 @@ package loader import ( "testing" - "github.com/docker/docker/cli/compose/types" + "github.com/docker/cli/cli/compose/types" "github.com/docker/docker/pkg/testutil" "github.com/stretchr/testify/assert" ) diff --git a/cli/config/config.go b/cli/config/config.go index 9b21a2c902..58c83b6404 100644 --- a/cli/config/config.go +++ b/cli/config/config.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" + "github.com/docker/cli/cli/config/configfile" "github.com/docker/docker/api/types" - "github.com/docker/docker/cli/config/configfile" "github.com/docker/docker/pkg/homedir" "github.com/pkg/errors" ) diff --git a/cli/config/config_test.go b/cli/config/config_test.go index 195473bb8a..41be45ffd9 100644 --- a/cli/config/config_test.go +++ b/cli/config/config_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/docker/docker/cli/config/configfile" + "github.com/docker/cli/cli/config/configfile" "github.com/docker/docker/pkg/homedir" ) diff --git a/cli/config/credentials/default_store.go b/cli/config/credentials/default_store.go index 263a4ea879..dc080dbd40 100644 --- a/cli/config/credentials/default_store.go +++ b/cli/config/credentials/default_store.go @@ -3,7 +3,7 @@ package credentials import ( "os/exec" - "github.com/docker/docker/cli/config/configfile" + "github.com/docker/cli/cli/config/configfile" ) // DetectDefaultStore sets the default credentials store diff --git a/cli/config/credentials/file_store.go b/cli/config/credentials/file_store.go index 3cab4a448b..4e3325c79b 100644 --- a/cli/config/credentials/file_store.go +++ b/cli/config/credentials/file_store.go @@ -1,8 +1,8 @@ package credentials import ( + "github.com/docker/cli/cli/config/configfile" "github.com/docker/docker/api/types" - "github.com/docker/docker/cli/config/configfile" "github.com/docker/docker/registry" ) diff --git a/cli/config/credentials/file_store_test.go b/cli/config/credentials/file_store_test.go index b6bfaa0607..6e16f2cd32 100644 --- a/cli/config/credentials/file_store_test.go +++ b/cli/config/credentials/file_store_test.go @@ -4,9 +4,9 @@ import ( "io/ioutil" "testing" + cliconfig "github.com/docker/cli/cli/config" + "github.com/docker/cli/cli/config/configfile" "github.com/docker/docker/api/types" - cliconfig "github.com/docker/docker/cli/config" - "github.com/docker/docker/cli/config/configfile" ) func newConfigFile(auths map[string]types.AuthConfig) *configfile.ConfigFile { diff --git a/cli/config/credentials/native_store.go b/cli/config/credentials/native_store.go index 68a87e8c66..15bb0e912f 100644 --- a/cli/config/credentials/native_store.go +++ b/cli/config/credentials/native_store.go @@ -1,10 +1,10 @@ package credentials import ( + "github.com/docker/cli/cli/config/configfile" "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" "github.com/docker/docker/api/types" - "github.com/docker/docker/cli/config/configfile" ) const ( diff --git a/cli/flags/common.go b/cli/flags/common.go index 3c9d8fa6e9..90270af299 100644 --- a/cli/flags/common.go +++ b/cli/flags/common.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/Sirupsen/logrus" - cliconfig "github.com/docker/docker/cli/config" + cliconfig "github.com/docker/cli/cli/config" "github.com/docker/docker/opts" "github.com/docker/go-connections/tlsconfig" "github.com/spf13/pflag" diff --git a/cli/flags/common_test.go b/cli/flags/common_test.go index cf0bf22e26..a00cd7a6ca 100644 --- a/cli/flags/common_test.go +++ b/cli/flags/common_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - cliconfig "github.com/docker/docker/cli/config" + cliconfig "github.com/docker/cli/cli/config" "github.com/spf13/pflag" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/test/cli.go b/cli/internal/test/cli.go index 610918a651..081588b0fd 100644 --- a/cli/internal/test/cli.go +++ b/cli/internal/test/cli.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "strings" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/config/configfile" - "github.com/docker/docker/client" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/config/configfile" + "github.com/docker/cli/client" ) // FakeCli emulates the default DockerCli diff --git a/cli/internal/test/doc.go b/cli/internal/test/doc.go index 41601bd8f1..3a8609716f 100644 --- a/cli/internal/test/doc.go +++ b/cli/internal/test/doc.go @@ -1,5 +1,5 @@ // Package test is a test-only package that can be used by other cli package to write unit test. // -// It as an internal package and cannot be used outside of github.com/docker/docker/cli package. +// It as an internal package and cannot be used outside of github.com/docker/cli/cli package. // package test diff --git a/cli/trust/trust.go b/cli/trust/trust.go index 3c75e485cc..c325b966a8 100644 --- a/cli/trust/trust.go +++ b/cli/trust/trust.go @@ -11,13 +11,13 @@ import ( "time" "github.com/Sirupsen/logrus" + "github.com/docker/cli/cli/command" + cliconfig "github.com/docker/cli/cli/config" "github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/auth/challenge" "github.com/docker/distribution/registry/client/transport" "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/cli/command" - cliconfig "github.com/docker/docker/cli/config" "github.com/docker/docker/registry" "github.com/docker/go-connections/tlsconfig" "github.com/docker/notary" diff --git a/client/README.md b/client/README.md index 059dfb3ce7..e21844b93b 100644 --- a/client/README.md +++ b/client/README.md @@ -12,7 +12,7 @@ import ( "fmt" "github.com/docker/docker/api/types" - "github.com/docker/docker/client" + "github.com/docker/cli/client" ) func main() { @@ -32,4 +32,4 @@ func main() { } ``` -[Full documentation is available on GoDoc.](https://godoc.org/github.com/docker/docker/client) +[Full documentation is available on GoDoc.](https://godoc.org/github.com/docker/cli/client) diff --git a/client/client.go b/client/client.go index df3698adc6..3f1ee8d432 100644 --- a/client/client.go +++ b/client/client.go @@ -23,7 +23,7 @@ For example, to list running containers (the equivalent of "docker ps"): "fmt" "github.com/docker/docker/api/types" - "github.com/docker/docker/client" + "github.com/docker/cli/client" ) func main() { diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go index 96283debc4..99642ba07f 100644 --- a/cmd/docker/docker.go +++ b/cmd/docker/docker.go @@ -7,14 +7,14 @@ import ( "strings" "github.com/Sirupsen/logrus" + "github.com/docker/cli/cli" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/command/commands" + cliconfig "github.com/docker/cli/cli/config" + "github.com/docker/cli/cli/debug" + cliflags "github.com/docker/cli/cli/flags" + "github.com/docker/cli/client" "github.com/docker/docker/api/types/versions" - "github.com/docker/docker/cli" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/command/commands" - cliconfig "github.com/docker/docker/cli/config" - "github.com/docker/docker/cli/debug" - cliflags "github.com/docker/docker/cli/flags" - "github.com/docker/docker/client" "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/term" "github.com/spf13/cobra" diff --git a/cmd/docker/docker_test.go b/cmd/docker/docker_test.go index 88afb41e9e..d5569fa14c 100644 --- a/cmd/docker/docker_test.go +++ b/cmd/docker/docker_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Sirupsen/logrus" - "github.com/docker/docker/cli/command" - "github.com/docker/docker/cli/debug" + "github.com/docker/cli/cli/command" + "github.com/docker/cli/cli/debug" "github.com/stretchr/testify/assert" )