Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1124 from vdemeester/using-cli-interface-everywhere-possible 

Use command.Cli interface instead of concrete type…
This commit is contained in:
Silvin 2018-06-14 16:43:15 +02:00 committed by GitHub
parent 449f0c067d 88068b9dd7
commit 805b34127a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/commands/commands.go
View File

@ -24,7 +24,7 @@ import (
) )
// AddCommands adds all the commands from cli/command to the root command // AddCommands adds all the commands from cli/command to the root command
func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) { func AddCommands(cmd *cobra.Command, dockerCli command.Cli) {
cmd.AddCommand( cmd.AddCommand(
// checkpoint // checkpoint
checkpoint.NewCheckpointCommand(dockerCli), checkpoint.NewCheckpointCommand(dockerCli),

24
cli/command/system/inspect.go
View File

@ -22,7 +22,7 @@ type inspectOptions struct {
} }
// NewInspectCommand creates a new cobra.Command for `docker inspect` // NewInspectCommand creates a new cobra.Command for `docker inspect`
func NewInspectCommand(dockerCli *command.DockerCli) *cobra.Command { func NewInspectCommand(dockerCli command.Cli) *cobra.Command {
var opts inspectOptions var opts inspectOptions
cmd := &cobra.Command{ cmd := &cobra.Command{
@ -43,7 +43,7 @@ func NewInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
return cmd return cmd
} }
func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error { func runInspect(dockerCli command.Cli, opts inspectOptions) error {
var elementSearcher inspect.GetRefFunc var elementSearcher inspect.GetRefFunc
switch opts.inspectType { switch opts.inspectType {
case "", "container", "image", "node", "network", "service", "volume", "task", "plugin", "secret": case "", "container", "image", "node", "network", "service", "volume", "task", "plugin", "secret":
@ -54,62 +54,62 @@ func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
return inspect.Inspect(dockerCli.Out(), opts.ids, opts.format, elementSearcher) return inspect.Inspect(dockerCli.Out(), opts.ids, opts.format, elementSearcher)
} }
func inspectContainers(ctx context.Context, dockerCli *command.DockerCli, getSize bool) inspect.GetRefFunc { func inspectContainers(ctx context.Context, dockerCli command.Cli, getSize bool) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().ContainerInspectWithRaw(ctx, ref, getSize) return dockerCli.Client().ContainerInspectWithRaw(ctx, ref, getSize)
} }
} }
func inspectImages(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectImages(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().ImageInspectWithRaw(ctx, ref) return dockerCli.Client().ImageInspectWithRaw(ctx, ref)
} }
} }
func inspectNetwork(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectNetwork(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().NetworkInspectWithRaw(ctx, ref, types.NetworkInspectOptions{}) return dockerCli.Client().NetworkInspectWithRaw(ctx, ref, types.NetworkInspectOptions{})
} }
} }
func inspectNode(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectNode(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().NodeInspectWithRaw(ctx, ref) return dockerCli.Client().NodeInspectWithRaw(ctx, ref)
} }
} }
func inspectService(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectService(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
// Service inspect shows defaults values in empty fields. // Service inspect shows defaults values in empty fields.
return dockerCli.Client().ServiceInspectWithRaw(ctx, ref, types.ServiceInspectOptions{InsertDefaults: true}) return dockerCli.Client().ServiceInspectWithRaw(ctx, ref, types.ServiceInspectOptions{InsertDefaults: true})
} }
} }
func inspectTasks(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectTasks(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().TaskInspectWithRaw(ctx, ref) return dockerCli.Client().TaskInspectWithRaw(ctx, ref)
} }
} }
func inspectVolume(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectVolume(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().VolumeInspectWithRaw(ctx, ref) return dockerCli.Client().VolumeInspectWithRaw(ctx, ref)
} }
} }
func inspectPlugin(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectPlugin(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().PluginInspectWithRaw(ctx, ref) return dockerCli.Client().PluginInspectWithRaw(ctx, ref)
} }
} }
func inspectSecret(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc { func inspectSecret(ctx context.Context, dockerCli command.Cli) inspect.GetRefFunc {
return func(ref string) (interface{}, []byte, error) { return func(ref string) (interface{}, []byte, error) {
return dockerCli.Client().SecretInspectWithRaw(ctx, ref) return dockerCli.Client().SecretInspectWithRaw(ctx, ref)
} }
} }
func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool, typeConstraint string) inspect.GetRefFunc { func inspectAll(ctx context.Context, dockerCli command.Cli, getSize bool, typeConstraint string) inspect.GetRefFunc {
var inspectAutodetect = []struct { var inspectAutodetect = []struct {
objectType string objectType string
isSizeSupported bool isSizeSupported bool