From b29e8ea412534a857d76bc716b79c7483e347f3a Mon Sep 17 00:00:00 2001 From: Pierre Dal-Pra Date: Wed, 8 Jun 2016 08:05:18 +0200 Subject: [PATCH] Use time.Duration for container restart/stop timeouts Signed-off-by: Pierre Dal-Pra --- api/client/container/restart.go | 3 ++- api/client/container/stop.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/client/container/restart.go b/api/client/container/restart.go index 7a4c5e273f..4fa237a238 100644 --- a/api/client/container/restart.go +++ b/api/client/container/restart.go @@ -3,6 +3,7 @@ package container import ( "fmt" "strings" + "time" "golang.org/x/net/context" @@ -39,7 +40,7 @@ func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command { func runRestart(dockerCli *client.DockerCli, opts *restartOptions) error { var errs []string for _, name := range opts.containers { - if err := dockerCli.Client().ContainerRestart(context.Background(), name, opts.nSeconds); err != nil { + if err := dockerCli.Client().ContainerRestart(context.Background(), 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/container/stop.go b/api/client/container/stop.go index 2a49b921ee..40b02b73d4 100644 --- a/api/client/container/stop.go +++ b/api/client/container/stop.go @@ -3,6 +3,7 @@ package container import ( "fmt" "strings" + "time" "golang.org/x/net/context" @@ -42,7 +43,7 @@ func runStop(dockerCli *client.DockerCli, opts *stopOptions) error { var errs []string for _, container := range opts.containers { - if err := dockerCli.Client().ContainerStop(ctx, container, opts.time); err != nil { + if err := dockerCli.Client().ContainerStop(ctx, container, time.Duration(opts.time)*time.Second); err != nil { errs = append(errs, err.Error()) } else { fmt.Fprintf(dockerCli.Out(), "%s\n", container)