Skip to content
Snippets Groups Projects
Unverified Commit b9463436 authored by Cyril Tovena's avatar Cyril Tovena Committed by GitHub
Browse files

fix panic in docker driver for newer docker version (18.09.7+) (#813)

parent 573673a0
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,7 @@ import (
"syscall"
"time"
"github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/plugins/logdriver"
"github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/logger/jsonfilelog"
......@@ -124,6 +125,9 @@ func consumeLog(lf *logPair) {
msg.Line = buf.Line
msg.Source = buf.Source
if buf.PartialLogMetadata != nil {
if msg.PLogMetaData == nil {
msg.PLogMetaData = &backend.PartialLogMetaData{}
}
msg.PLogMetaData.ID = buf.PartialLogMetadata.Id
msg.PLogMetaData.Last = buf.PartialLogMetadata.Last
msg.PLogMetaData.Ordinal = int(buf.PartialLogMetadata.Ordinal)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment