Merge pull request #1749 from thaJeztah/ignore_sigurg

mobycli: ignore SIGURG on Linux and Darwin

cli/mobycli/exec.go

@@ -106,8 +106,13 @@ func RunDocker(childExit chan bool, args ...string) error {
 				if cmd.Process == nil {
 					continue // can happen if receiving signal before the process is actually started
 				}
-				// nolint errcheck
+				// In go1.14+, the go runtime issues SIGURG as an interrupt to
-				cmd.Process.Signal(sig)
+				// support preemptable system calls on Linux. Since we can't
+				// forward that along we'll check that here.
+				if isRuntimeSig(sig) {
+					continue
+				}
+				_ = cmd.Process.Signal(sig)
 			case <-childExit:
 				return
 			}

cli/mobycli/exec_unix.go

@@ -0,0 +1,29 @@
+// +build !windows
+
+/*
+   Copyright 2020 Docker Compose CLI authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package mobycli
+
+import (
+	"os"
+
+	"golang.org/x/sys/unix"
+)
+
+func isRuntimeSig(s os.Signal) bool {
+	return s == unix.SIGURG
+}

cli/mobycli/exec_windows.go

@@ -0,0 +1,23 @@
+/*
+   Copyright 2020 Docker Compose CLI authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package mobycli
+
+import "os"
+
+func isRuntimeSig(s os.Signal) bool {
+	return false
+}