diff --git a/api/client/container/restart.go b/api/client/container/restart.go index 4fa237a238..98618b5073 100644 --- a/api/client/container/restart.go +++ b/api/client/container/restart.go @@ -38,9 +38,10 @@ func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command { } func runRestart(dockerCli *client.DockerCli, opts *restartOptions) error { + ctx := context.Background() var errs []string for _, name := range opts.containers { - if err := dockerCli.Client().ContainerRestart(context.Background(), name, time.Duration(opts.nSeconds)*time.Second); err != nil { + if err := dockerCli.Client().ContainerRestart(ctx, name, time.Duration(opts.nSeconds)*time.Second); err != nil { errs = append(errs, err.Error()) } else { fmt.Fprintf(dockerCli.Out(), "%s\n", name) diff --git a/api/client/network/inspect.go b/api/client/network/inspect.go index 4df137e324..52b130f4b3 100644 --- a/api/client/network/inspect.go +++ b/api/client/network/inspect.go @@ -35,8 +35,10 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command { func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error { client := dockerCli.Client() + ctx := context.Background() + getNetFunc := func(name string) (interface{}, []byte, error) { - return client.NetworkInspectWithRaw(context.Background(), name) + return client.NetworkInspectWithRaw(ctx, name) } return inspect.Inspect(dockerCli.Out(), opts.names, opts.format, getNetFunc) diff --git a/api/client/volume/inspect.go b/api/client/volume/inspect.go index cbdd96b3ab..2c9ae3a00c 100644 --- a/api/client/volume/inspect.go +++ b/api/client/volume/inspect.go @@ -35,8 +35,10 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command { func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error { client := dockerCli.Client() + ctx := context.Background() + getVolFunc := func(name string) (interface{}, []byte, error) { - i, err := client.VolumeInspect(context.Background(), name) + i, err := client.VolumeInspect(ctx, name) return i, nil, err }