starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-27 01:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from seemethere/cherry_pick_33335

Browse Source 
Check signal is unset before using user stopsignal
This commit is contained in:
Andrew Hsu
2017-06-12 19:24:57 -07:00
committed by GitHub
parent 6f00f5603d 3910d5b571
commit 97a704b2a7
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/kill.go
+1 -1
View File
@@ -69,7 +69,7 @@ func (daemon *Daemon) killWithSignal(container *containerpkg.Container, sig int)
return errNotRunning{container.ID}
}
if container.Config.StopSignal != "" {
if container.Config.StopSignal != "" && syscall.Signal(sig) != syscall.SIGKILL {
containerStopSignal, err := signal.ParseSignal(container.Config.StopSignal)
if err != nil {
return err