GitList

Browse code

With cobra switch (and maybe before), some context weren't *plumbed* the
right way, fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Vincent Demeester authored on 2016/06/10 00:58:10
Showing 3 changed files

@@ -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)

@@ -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)

@@ -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
+                     	}