summaryrefslogtreecommitdiff
path: root/cmd/podman/shared/container.go
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-05-18 19:39:11 -0400
committerPeter Hunt <pehunt@redhat.com>2019-05-28 11:10:57 -0400
commitf61fa28d39298def261dded2644b8dcf45366415 (patch)
tree36081cf2a2644264099ffcf32836b8c85f9ddb04 /cmd/podman/shared/container.go
parent18d7fcb5eb1966c4d3748a50c625c01c1ebd9f5b (diff)
downloadpodman-f61fa28d39298def261dded2644b8dcf45366415.tar.gz
podman-f61fa28d39298def261dded2644b8dcf45366415.tar.bz2
podman-f61fa28d39298def261dded2644b8dcf45366415.zip
Added --log-driver and journald logging
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'cmd/podman/shared/container.go')
-rw-r--r--cmd/podman/shared/container.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index fe447d10d..55cc529e0 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -631,6 +631,10 @@ func GetCtrInspectInfo(config *libpod.ContainerConfig, ctrInspectData *inspect.C
memKernel, memReservation, memSwap, memSwappiness, memDisableOOMKiller := getMemoryInfo(spec)
pidsLimit := getPidsInfo(spec)
cgroup := getCgroup(spec)
+ logConfig := inspect.LogConfig{
+ config.LogDriver,
+ make(map[string]string),
+ }
data := &inspect.ContainerData{
ctrInspectData,
@@ -681,6 +685,7 @@ func GetCtrInspectInfo(config *libpod.ContainerConfig, ctrInspectData *inspect.C
Ulimits: createArtifact.Resources.Ulimit,
SecurityOpt: createArtifact.SecurityOpts,
Tmpfs: createArtifact.Tmpfs,
+ LogConfig: &logConfig,
},
&inspect.CtrConfig{
Hostname: spec.Hostname,