From b2c77abc35514e3f37fcbdf592a994d55fc698a0 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Thu, 8 Sep 2016 13:11:39 -0400 Subject: [PATCH] Move api/client -> cli/command Using gomvpkg -from github.com/docker/docker/api/client -to github.com/docker/docker/cli/command -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}' Signed-off-by: Daniel Nephin --- docker.go | 10 +++++----- docker_test.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker.go b/docker.go index 38907970d3..969cd80876 100644 --- a/docker.go +++ b/docker.go @@ -5,9 +5,9 @@ import ( "os" "github.com/Sirupsen/logrus" - "github.com/docker/docker/api/client" - "github.com/docker/docker/api/client/command" "github.com/docker/docker/cli" + "github.com/docker/docker/cli/command" + "github.com/docker/docker/cli/command/commands" cliflags "github.com/docker/docker/cli/flags" "github.com/docker/docker/cliconfig" "github.com/docker/docker/dockerversion" @@ -17,7 +17,7 @@ import ( "github.com/spf13/pflag" ) -func newDockerCommand(dockerCli *client.DockerCli) *cobra.Command { +func newDockerCommand(dockerCli *command.DockerCli) *cobra.Command { opts := cliflags.NewClientOptions() var flags *pflag.FlagSet @@ -52,7 +52,7 @@ func newDockerCommand(dockerCli *client.DockerCli) *cobra.Command { cmd.SetOutput(dockerCli.Out()) cmd.AddCommand(newDaemonCommand()) - command.AddCommands(cmd, dockerCli) + commands.AddCommands(cmd, dockerCli) return cmd } @@ -70,7 +70,7 @@ func main() { stdin, stdout, stderr := term.StdStreams() logrus.SetOutput(stderr) - dockerCli := client.NewDockerCli(stdin, stdout, stderr) + dockerCli := command.NewDockerCli(stdin, stdout, stderr) cmd := newDockerCommand(dockerCli) if err := cmd.Execute(); err != nil { diff --git a/docker_test.go b/docker_test.go index 72d2311521..47e24eb0da 100644 --- a/docker_test.go +++ b/docker_test.go @@ -7,13 +7,13 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/utils" - "github.com/docker/docker/api/client" + "github.com/docker/docker/cli/command" ) func TestClientDebugEnabled(t *testing.T) { defer utils.DisableDebug() - cmd := newDockerCommand(&client.DockerCli{}) + cmd := newDockerCommand(&command.DockerCli{}) cmd.Flags().Set("debug", "true") if err := cmd.PersistentPreRunE(cmd, []string{}); err != nil {