diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 17:17:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:17:27 -0400 |
| commit | 7b00e49f657305f233e4e29613821305bf4d2962 (patch) | |
| tree | 8470c3a4a002f93514762f7fe2eb37cc0396d44b /libpod/runtime_ctr.go | |
| parent | daabbc1a1e82b840a51b6d769cdf19cfda474144 (diff) | |
| parent | 0e171b7b3327948f2e9e32d9e496736bd7a48009 (diff) | |
| download | podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.gz podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.bz2 podman-7b00e49f657305f233e4e29613821305bf4d2962.zip | |
Merge pull request #6560 from mheon/fix_exec_logdriver
Do not share container log driver for exec
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index f0beb0941..0431861b5 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -321,7 +321,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai ctrNamedVolumes = append(ctrNamedVolumes, newVol) } - if ctr.config.LogPath == "" && ctr.config.LogDriver != define.JournaldLogging { + if ctr.config.LogPath == "" && ctr.config.LogDriver != define.JournaldLogging && ctr.config.LogDriver != define.NoLogging { ctr.config.LogPath = filepath.Join(ctr.config.StaticDir, "ctr.log") } |