summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-10 20:19:33 +0200
committerGitHub <noreply@github.com>2019-06-10 20:19:33 +0200
commita89d013b12049ebef604c6978fc3b581d6ecb81c (patch)
tree614ea7ae21e32280a60a29bb7b5eee533bb4da26
parent013b897acee89018265fb563a1f52f899e8ec80c (diff)
parent93135565914c17eae64b81855e72526fe6c80e66 (diff)
downloadpodman-a89d013b12049ebef604c6978fc3b581d6ecb81c.tar.gz
podman-a89d013b12049ebef604c6978fc3b581d6ecb81c.tar.bz2
podman-a89d013b12049ebef604c6978fc3b581d6ecb81c.zip
Merge pull request #3283 from haircommander/logging-play-kube-hotfix
Set a default log driver if none is specified
-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)