From 20138a81bcdb27f7768690a2af5e7999a614a4d9 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sat, 21 Aug 2021 14:06:41 +0200
Subject: [PATCH] docker kill: don't set default signal on the client side

The default signal is already determined by the daemon, so the
CLI should not send a signal.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 cli/command/container/kill.go      |  2 +-
 docs/reference/commandline/kill.md |  2 +-
 man/src/container/kill.md          | 22 ++++++++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/cli/command/container/kill.go b/cli/command/container/kill.go
index 8c74416d1b..25c073447a 100644
--- a/cli/command/container/kill.go
+++ b/cli/command/container/kill.go
@@ -34,7 +34,7 @@ func NewKillCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.signal, "signal", "s", "KILL", "Signal to send to the container")
+	flags.StringVarP(&opts.signal, "signal", "s", "", "Signal to send to the container")
 	return cmd
 }
 
diff --git a/docs/reference/commandline/kill.md b/docs/reference/commandline/kill.md
index bdccdc5d59..e36b836b06 100644
--- a/docs/reference/commandline/kill.md
+++ b/docs/reference/commandline/kill.md
@@ -13,7 +13,7 @@ Kill one or more running containers
 
 Options:
       --help            Print usage
-  -s, --signal string   Signal to send to the container (default "KILL")
+  -s, --signal string   Signal to send to the container
 ```
 
 ## Description
diff --git a/man/src/container/kill.md b/man/src/container/kill.md
index b8b94e528c..740f2f40f9 100644
--- a/man/src/container/kill.md
+++ b/man/src/container/kill.md
@@ -1,2 +1,20 @@
-The main process inside each container specified will be sent SIGKILL,
- or any signal specified with option --signal.
+The `docker kill` subcommand kills one or more containers. The main process
+inside the container is sent `SIGKILL` signal (default), or the signal that is
+specified with the `--signal` option. You can reference a container by its
+ID, ID-prefix, or name.
+
+The `--signal` flag sets the system call signal that is sent to the container.
+This signal can be a signal name in the format `SIG<NAME>`, for instance `SIGINT`,
+or an unsigned number that matches a position in the kernel's syscall table,
+for instance `2`.
+
+While the default (`SIGKILL`) signal will terminate the container, the signal
+set through `--signal` may be non-terminal, depending on the container's main
+process. For example, the `SIGHUP` signal in most cases will be non-terminal,
+and the container will continue running after receiving the signal.
+
+> **Note**
+>
+> `ENTRYPOINT` and `CMD` in the *shell* form run as a child process of
+> `/bin/sh -c`, which does not pass signals. This means that the executable is
+> not the container’s PID 1 and does not receive Unix signals.