summaryrefslogtreecommitdiff
path: root/cmd/dockerd/docker.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/dockerd/docker.go')
-rw-r--r--cmd/dockerd/docker.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/dockerd/docker.go b/cmd/dockerd/docker.go
index da11a0cfdd..5b4d5f5c0f 100644
--- a/cmd/dockerd/docker.go
+++ b/cmd/dockerd/docker.go
@@ -3,6 +3,8 @@ package main
import (
"fmt"
"os"
+ "os/signal"
+ "syscall"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/dockerversion"
@@ -77,6 +79,11 @@ func main() {
return
}
+ // Ignore SIGPIPE events. These are generated by systemd when journald is restarted while
+ // the docker daemon is not restarted and also running under systemd.
+ // Fixes https://github.com/docker/docker/issues/19728
+ signal.Ignore(syscall.SIGPIPE)
+
// initial log formatting; this setting is updated after the daemon configuration is loaded.
logrus.SetFormatter(&logrus.TextFormatter{
TimestampFormat: jsonmessage.RFC3339NanoFixed,