Merge pull request #2987 from thaJeztah/20.10_revert_backport_ignore_…

…sigurg [20.10] Revert "Ignore SIGURG on Linux."
docker · Mar 2, 2021 · 55c4c88 · 55c4c88
2 parents d3cb89e + f33a69f
commit 55c4c88
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 196 deletions.
diff --git a/cli/command/container/attach.go b/cli/command/container/attach.go
@@ -97,8 +97,7 @@ func runAttach(dockerCli command.Cli, opts *attachOptions) error {
 	}
 
 	if opts.proxy && !c.Config.Tty {
-		sigc := notfiyAllSignals()
-		go ForwardAllSignals(ctx, dockerCli, opts.container, sigc)
+		sigc := ForwardAllSignals(ctx, dockerCli, opts.container)
 		defer signal.StopCatch(sigc)
 	}
 

diff --git a/cli/command/container/client_test.go b/cli/command/container/client_test.go
@@ -32,7 +32,6 @@ type fakeClient struct {
 	containerExportFunc     func(string) (io.ReadCloser, error)
 	containerExecResizeFunc func(id string, options types.ResizeOptions) error
 	containerRemoveFunc     func(ctx context.Context, container string, options types.ContainerRemoveOptions) error
-	containerKillFunc       func(ctx context.Context, container, signal string) error
 	Version                 string
 }
 
@@ -155,10 +154,3 @@ func (f *fakeClient) ContainerExecResize(_ context.Context, id string, options t
 	}
 	return nil
 }
-
-func (f *fakeClient) ContainerKill(ctx context.Context, container, signal string) error {
-	if f.containerKillFunc != nil {
-		return f.containerKillFunc(ctx, container, signal)
-	}
-	return nil
-}
diff --git a/cli/command/container/run.go b/cli/command/container/run.go
@@ -131,8 +131,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio
 		return runStartContainerErr(err)
 	}
 	if opts.sigProxy {
-		sigc := notfiyAllSignals()
-		go ForwardAllSignals(ctx, dockerCli, createResponse.ID, sigc)
+		sigc := ForwardAllSignals(ctx, dockerCli, createResponse.ID)
 		defer signal.StopCatch(sigc)
 	}
 

diff --git a/cli/command/container/signals.go b/cli/command/container/signals.go
diff --git a/cli/command/container/signals_linux.go b/cli/command/container/signals_linux.go
diff --git a/cli/command/container/signals_linux_test.go b/cli/command/container/signals_linux_test.go
diff --git a/cli/command/container/signals_notlinux.go b/cli/command/container/signals_notlinux.go
diff --git a/cli/command/container/signals_test.go b/cli/command/container/signals_test.go
diff --git a/cli/command/container/start.go b/cli/command/container/start.go
@@ -74,8 +74,7 @@ func runStart(dockerCli command.Cli, opts *startOptions) error {
 
 		// We always use c.ID instead of container to maintain consistency during `docker start`
 		if !c.Config.Tty {
-			sigc := notfiyAllSignals()
-			ForwardAllSignals(ctx, dockerCli, c.ID, sigc)
+			sigc := ForwardAllSignals(ctx, dockerCli, c.ID)
 			defer signal.StopCatch(sigc)
 		}
 

diff --git a/cli/command/container/tty.go b/cli/command/container/tty.go
@@ -95,3 +95,32 @@ func MonitorTtySize(ctx context.Context, cli command.Cli, id string, isExec bool
 	}
 	return nil
 }
+
+// ForwardAllSignals forwards signals to the container
+func ForwardAllSignals(ctx context.Context, cli command.Cli, cid string) chan os.Signal {
+	sigc := make(chan os.Signal, 128)
+	signal.CatchAll(sigc)
+	go func() {
+		for s := range sigc {
+			if s == signal.SIGCHLD || s == signal.SIGPIPE {
+				continue
+			}
+			var sig string
+			for sigStr, sigN := range signal.SignalMap {
+				if sigN == s {
+					sig = sigStr
+					break
+				}
+			}
+			if sig == "" {
+				fmt.Fprintf(cli.Err(), "Unsupported signal: %v. Discarding.\n", s)
+				continue
+			}
+
+			if err := cli.Client().ContainerKill(ctx, cid, sig); err != nil {
+				logrus.Debugf("Error sending signal: %s", err)
+			}
+		}
+	}()
+	return sigc
+}