summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-06-08 17:44:44 -0400
committerPeter Hunt <pehunt@redhat.com>2019-06-08 17:46:17 -0400
commit93135565914c17eae64b81855e72526fe6c80e66 (patch)
treeca2855da3604f92160722082540b1626b9cdfac3 /pkg
parentf6a2860b625a796bd9d6fd48e641b7f7fa50d28a (diff)
downloadpodman-93135565914c17eae64b81855e72526fe6c80e66.tar.gz
podman-93135565914c17eae64b81855e72526fe6c80e66.tar.bz2
podman-93135565914c17eae64b81855e72526fe6c80e66.zip
only set log driver if it isn't empty
Now, not setting a log driver in a create config correctly takes the default (k8s-logging) Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/spec/createconfig.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go
index e4501aaac..ed8036a54 100644
--- a/pkg/spec/createconfig.go
+++ b/pkg/spec/createconfig.go
@@ -320,7 +320,9 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l
options = append(options, libpod.WithLogPath(logPath))
}
- options = append(options, libpod.WithLogDriver(c.LogDriver))
+ if c.LogDriver != "" {
+ options = append(options, libpod.WithLogDriver(c.LogDriver))
+ }
if c.IPAddress != "" {
ip := net.ParseIP(c.IPAddress)