summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorcdoern <cbdoer23@g.holycross.edu>2022-05-03 22:26:43 -0400
committercdoern <cbdoer23@g.holycross.edu>2022-05-06 15:59:06 -0400
commitb58e7e7f11f99b22d68cbbf28c8d52ff10be482e (patch)
tree785bf750363dce3b51abadee5509f242c9bae45f /libpod
parentab3e072a0c3d321fd12cbd1f6ef8e322c6d9214a (diff)
downloadpodman-b58e7e7f11f99b22d68cbbf28c8d52ff10be482e.tar.gz
podman-b58e7e7f11f99b22d68cbbf28c8d52ff10be482e.tar.bz2
podman-b58e7e7f11f99b22d68cbbf28c8d52ff10be482e.zip
play kube log tag handling
currently tags cause a panic due to an uninitialized map. Initialize the map and add parsing to make sure we are only tagging with journald resolves #13356 Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/oci_conmon_exec_linux.go2
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))...)