diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-21 05:48:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-21 05:48:38 -0500 |
commit | 55982295dd05e7fcb1fed3883aea3b2027e369af (patch) | |
tree | 58cabf506e626b2114aed6083534b77c1db107df /cmd/podman/common/specgen.go | |
parent | 14443ccdfc19a7d719c63937ce76bfddf01f88e2 (diff) | |
parent | f43046745386d8cd15e010a6ade65619ad12b383 (diff) | |
download | podman-55982295dd05e7fcb1fed3883aea3b2027e369af.tar.gz podman-55982295dd05e7fcb1fed3883aea3b2027e369af.tar.bz2 podman-55982295dd05e7fcb1fed3883aea3b2027e369af.zip |
Merge pull request #9036 from baude/composelog
Set log driver for compatibility containers
Diffstat (limited to 'cmd/podman/common/specgen.go')
-rw-r--r-- | cmd/podman/common/specgen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 287836d9f..4cc53a630 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -463,7 +463,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string if s.LogConfiguration == nil { s.LogConfiguration = &specgen.LogConfig{} } - s.LogConfiguration.Driver = define.KubernetesLogging + if ld := c.LogDriver; len(ld) > 0 { s.LogConfiguration.Driver = ld } |