Browse Source

Merge pull request #2749 from jpoimboe/dont-forward-SIGCHLD

Do not forward SIGCHLD to container
Michael Crosby 11 years ago
parent
commit
cfbd9ea16d
1 changed files with 3 additions and 0 deletions
  1. 3 0
      commands.go

+ 3 - 0
commands.go

@@ -549,6 +549,9 @@ func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {
 	utils.CatchAll(sigc)
 	utils.CatchAll(sigc)
 	go func() {
 	go func() {
 		for s := range sigc {
 		for s := range sigc {
+			if s == syscall.SIGCHLD {
+				continue
+			}
 			if _, _, err := cli.call("POST", fmt.Sprintf("/containers/%s/kill?signal=%d", cid, s), nil); err != nil {
 			if _, _, err := cli.call("POST", fmt.Sprintf("/containers/%s/kill?signal=%d", cid, s), nil); err != nil {
 				utils.Debugf("Error sending signal: %s", err)
 				utils.Debugf("Error sending signal: %s", err)
 			}
 			}