diff --git a/examples/logging.yml b/examples/logging.yml index fb1b74734..2ae22d705 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -7,7 +7,7 @@ init: - linuxkit/runc:v0.5 - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - linuxkit/ca-certificates:v0.5 - - linuxkit/memlogd:v0.5 + - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0 onboot: - name: sysctl image: linuxkit/sysctl:v0.5 diff --git a/pkg/memlogd/cmd/logwrite/main.go b/pkg/memlogd/cmd/logwrite/main.go index 707547237..eb99b93d4 100644 --- a/pkg/memlogd/cmd/logwrite/main.go +++ b/pkg/memlogd/cmd/logwrite/main.go @@ -70,11 +70,11 @@ func main() { raddr := net.UnixAddr{Name: serverSocket, Net: "unixgram"} - if err = sendFD(conn, &raddr, name+".stdout", remoteStdoutFd); err != nil { + if err = sendFD(conn, &raddr, name+".out", remoteStdoutFd); err != nil { log.Fatal("fd stdout send failed: ", err) } - if err = sendFD(conn, &raddr, name+".stderr", remoteStderrFd); err != nil { + if err = sendFD(conn, &raddr, name, remoteStderrFd); err != nil { log.Fatal("fd stderr send failed: ", err) } diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 1f30dbfe0..160cb319b 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - linuxkit/ca-certificates:v0.5 - - linuxkit/memlogd:v0.5 + - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0 services: # A service which generates logs of log messages - name: fill-the-logs diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 8f88993b2..89453f1ba 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:v0.5 - linuxkit/containerd:0784cc754edb296b996c3510abbdf69686ef0f24 - linuxkit/ca-certificates:v0.5 - - linuxkit/memlogd:v0.5 + - linuxkit/memlogd:ba4fcf55c35a3833546a1e39125bf0fa940327b0 services: - name: kmsg image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0