p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace api/client imports with cli/command in experimental files.

Browse Source 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8f3e3fb6e5
Component: cli
This commit is contained in:
Daniel Nephin
2016-09-08 14:54:01 -04:00
parent 964a552e76
commit bc178aeaa8
17 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/cli/command/stack/cmd.go
View File

@ -5,13 +5,13 @@ package stack
import (
"fmt"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/spf13/cobra"
)
// NewStackCommand returns a cobra command for `stack` subcommands
func NewStackCommand(dockerCli *client.DockerCli) *cobra.Command {
func NewStackCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "stack",
Short: "Manage Docker stacks",
@ -31,7 +31,7 @@ func NewStackCommand(dockerCli *client.DockerCli) *cobra.Command {
}
// NewTopLevelDeployCommand returns a command for `docker deploy`
func NewTopLevelDeployCommand(dockerCli *client.DockerCli) *cobra.Command {
func NewTopLevelDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := newDeployCommand(dockerCli)
// Remove the aliases at the top level
cmd.Aliases = []string{}

8
components/cli/command/stack/config.go
View File

@ -3,9 +3,9 @@
package stack
import (
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/bundlefile"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/bundlefile"
"github.com/spf13/cobra"
)
@ -14,7 +14,7 @@ type configOptions struct {
namespace string
}
func newConfigCommand(dockerCli *client.DockerCli) *cobra.Command {
func newConfigCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts configOptions
cmd := &cobra.Command{
@ -32,7 +32,7 @@ func newConfigCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runConfig(dockerCli *client.DockerCli, opts configOptions) error {
func runConfig(dockerCli *command.DockerCli, opts configOptions) error {
bundle, err := loadBundlefile(dockerCli.Err(), opts.namespace, opts.bundlefile)
if err != nil {
return err

12
components/cli/command/stack/deploy.go
View File

@ -8,11 +8,11 @@ import (
"github.com/spf13/cobra"
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/bundlefile"
"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/bundlefile"
)
const (
@ -25,7 +25,7 @@ type deployOptions struct {
sendRegistryAuth bool
}
func newDeployCommand(dockerCli *client.DockerCli) *cobra.Command {
func newDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts deployOptions
cmd := &cobra.Command{
@ -45,7 +45,7 @@ func newDeployCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runDeploy(dockerCli *client.DockerCli, opts deployOptions) error {
func runDeploy(dockerCli *command.DockerCli, opts deployOptions) error {
bundle, err := loadBundlefile(dockerCli.Err(), opts.namespace, opts.bundlefile)
if err != nil {
return err
@ -85,7 +85,7 @@ func getUniqueNetworkNames(services map[string]bundlefile.Service) []string {
func updateNetworks(
ctx context.Context,
dockerCli *client.DockerCli,
dockerCli *command.DockerCli,
networks []string,
namespace string,
) error {
@ -133,7 +133,7 @@ func convertNetworks(networks []string, namespace string, name string) []swarm.N
func deployServices(
ctx context.Context,
dockerCli *client.DockerCli,
dockerCli *command.DockerCli,
services map[string]bundlefile.Service,
namespace string,
sendAuth bool,

2
components/cli/command/stack/opts.go
View File

@ -7,7 +7,7 @@ import (
"io"
"os"
"github.com/docker/docker/api/client/bundlefile"
"github.com/docker/docker/cli/command/bundlefile"
"github.com/spf13/pflag"
)

10
components/cli/command/stack/ps.go
View File

@ -7,12 +7,12 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/idresolver"
"github.com/docker/docker/api/client/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/idresolver"
"github.com/docker/docker/cli/command/task"
"github.com/docker/docker/opts"
"github.com/spf13/cobra"
)
@ -25,7 +25,7 @@ type psOptions struct {
noResolve bool
}
func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := psOptions{filter: opts.NewFilterOpt()}
cmd := &cobra.Command{
@ -46,7 +46,7 @@ func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runPS(dockerCli *client.DockerCli, opts psOptions) error {
func runPS(dockerCli *command.DockerCli, opts psOptions) error {
namespace := opts.namespace
client := dockerCli.Client()
ctx := context.Background()

6
components/cli/command/stack/remove.go
View File

@ -7,8 +7,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
"github.com/spf13/cobra"
)
@ -16,7 +16,7 @@ type removeOptions struct {
namespace string
}
func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts removeOptions
cmd := &cobra.Command{
@ -32,7 +32,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runRemove(dockerCli *client.DockerCli, opts removeOptions) error {
func runRemove(dockerCli *command.DockerCli, opts removeOptions) error {
namespace := opts.namespace
client := dockerCli.Client()
stderr := dockerCli.Err()

8
components/cli/command/stack/services.go
View File

@ -7,11 +7,11 @@ import (
"golang.org/x/net/context"
"github.com/docker/docker/api/client"
"github.com/docker/docker/api/client/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/service"
"github.com/docker/docker/opts"
"github.com/spf13/cobra"
)
@ -26,7 +26,7 @@ type servicesOptions struct {
namespace string
}
func newServicesCommand(dockerCli *client.DockerCli) *cobra.Command {
func newServicesCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := servicesOptions{filter: opts.NewFilterOpt()}
cmd := &cobra.Command{
@ -45,7 +45,7 @@ func newServicesCommand(dockerCli *client.DockerCli) *cobra.Command {
return cmd
}
func runServices(dockerCli *client.DockerCli, opts servicesOptions) error {
func runServices(dockerCli *command.DockerCli, opts servicesOptions) error {
ctx := context.Background()
client := dockerCli.Client()