containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3283 from haircommander/logging-play-kube-hotfix 

Set a default log driver if none is specified
This commit is contained in:
OpenShift Merge Robot 2019-06-10 20:19:33 +02:00 committed by GitHub
parent 013b897ace 9313556591
commit a89d013b12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/spec/createconfig.go
View File

@ -320,7 +320,9 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l
options = append(options, libpod.WithLogPath(logPath)) 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 != "" { if c.IPAddress != "" {
ip := net.ParseIP(c.IPAddress) ip := net.ParseIP(c.IPAddress)