diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-09 04:48:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 04:48:49 -0400 |
| commit | ccb6211c7beff29ba0d0d374665e1b24262c276f (patch) | |
| tree | 740b480f8610df79055a2b18ca077aaa1bbfa7ac /libpod | |
| parent | a0ecb8675d1c45f083a70a6b3faaebd22abe5417 (diff) | |
| parent | b58e7e7f11f99b22d68cbbf28c8d52ff10be482e (diff) | |
| download | podman-ccb6211c7beff29ba0d0d374665e1b24262c276f.tar.gz podman-ccb6211c7beff29ba0d0d374665e1b24262c276f.tar.bz2 podman-ccb6211c7beff29ba0d0d374665e1b24262c276f.zip | |
Merge pull request #14121 from cdoern/kube
play kube log tag handling
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 6d2f13525..70124bec1 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -391,7 +391,7 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex } defer processFile.Close() - args := r.sharedConmonArgs(c, sessionID, c.execBundlePath(sessionID), c.execPidPath(sessionID), c.execLogPath(sessionID), c.execExitFileDir(sessionID), ociLog, define.NoLogging, "") + args := r.sharedConmonArgs(c, sessionID, c.execBundlePath(sessionID), c.execPidPath(sessionID), c.execLogPath(sessionID), c.execExitFileDir(sessionID), ociLog, define.NoLogging, c.config.LogTag) if options.PreserveFDs > 0 { args = append(args, formatRuntimeOpts("--preserve-fds", fmt.Sprintf("%d", options.PreserveFDs))...) |