From b9463436b2a6372ccd468a5dc48be902a0fb9b6d Mon Sep 17 00:00:00 2001
From: Cyril Tovena <cyril.tovena@gmail.com>
Date: Mon, 29 Jul 2019 16:06:33 -0400
Subject: [PATCH] fix panic in docker driver for newer docker version
(18.09.7+) (#813)
---
cmd/docker-driver/driver.go | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/cmd/docker-driver/driver.go b/cmd/docker-driver/driver.go
index 4a5fbb82..f99e5c33 100644
--- a/cmd/docker-driver/driver.go
+++ b/cmd/docker-driver/driver.go
@@ -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)
--
GitLab