From b303e229ca6ec61e43b1b7a93f6ff034a3945644 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 9 Mar 2017 09:28:19 +0100 Subject: [PATCH] Fix description of `docker run|create --stop-signal` in help message Signed-off-by: Harald Albers --- cli/command/container/opts.go | 2 +- docs/reference/commandline/create.md | 2 +- docs/reference/commandline/run.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index 0413ae5f71..564a49367a 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -173,7 +173,7 @@ func addFlags(flags *pflag.FlagSet) *containerOptions { flags.Var(&copts.labelsFile, "label-file", "Read in a line delimited file of labels") flags.BoolVar(&copts.readonlyRootfs, "read-only", false, "Mount the container's root filesystem as read only") flags.StringVar(&copts.restartPolicy, "restart", "no", "Restart policy to apply when a container exits") - flags.StringVar(&copts.stopSignal, "stop-signal", signal.DefaultStopSignal, fmt.Sprintf("Signal to stop a container, %v by default", signal.DefaultStopSignal)) + flags.StringVar(&copts.stopSignal, "stop-signal", signal.DefaultStopSignal, "Signal to stop a container") flags.IntVar(&copts.stopTimeout, "stop-timeout", 0, "Timeout (in seconds) to stop a container") flags.SetAnnotation("stop-timeout", "version", []string{"1.25"}) flags.Var(copts.sysctls, "sysctl", "Sysctl options") diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md index 3540f6789c..756b2b4099 100644 --- a/docs/reference/commandline/create.md +++ b/docs/reference/commandline/create.md @@ -111,7 +111,7 @@ Options: The format is ``. `number` must be greater than `0`. Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes. - --stop-signal string Signal to stop a container, SIGTERM by default (default "SIGTERM") + --stop-signal string Signal to stop a container (default "SIGTERM") --stop-timeout=10 Timeout (in seconds) to stop a container --storage-opt value Storage driver options for the container (default []) --sysctl value Sysctl options (default map[]) diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index 66a16f3986..a74dc77999 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -122,7 +122,7 @@ Options: Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes. --sig-proxy Proxy received signals to the process (default true) - --stop-signal string Signal to stop a container, SIGTERM by default (default "SIGTERM") + --stop-signal string Signal to stop a container (default "SIGTERM") --stop-timeout=10 Timeout (in seconds) to stop a container --storage-opt value Storage driver options for the container (default []) --sysctl value Sysctl options (default map[])