diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-29 17:51:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 17:51:27 +0200 |
| commit | 294448c2ea880ec550548537b0681a0e30e161d7 (patch) | |
| tree | bf19af8e02cc57a422174cd9e3e6e24e221eac59 /pkg | |
| parent | c9357f07cea6a62e59714200073541711aa3b55c (diff) | |
| parent | 88429242ddf82c03509ca66a687d9fb1534d2446 (diff) | |
| download | podman-294448c2ea880ec550548537b0681a0e30e161d7.tar.gz podman-294448c2ea880ec550548537b0681a0e30e161d7.tar.bz2 podman-294448c2ea880ec550548537b0681a0e30e161d7.zip | |
Merge pull request #2709 from haircommander/journald
Add libpod journald logging
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/inspect/inspect.go | 2 | ||||
| -rw-r--r-- | pkg/spec/createconfig.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index 693755aa8..2082bb3a6 100644 --- a/pkg/inspect/inspect.go +++ b/pkg/inspect/inspect.go @@ -103,7 +103,7 @@ type CtrConfig struct { // LogConfig holds the log information for a container type LogConfig struct { - Type string `json:"Type"` // TODO + Type string `json:"Type"` Config map[string]string `json:"Config"` //idk type, TODO } diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 9979e773c..e4501aaac 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -319,6 +319,9 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l if logPath != "" { options = append(options, libpod.WithLogPath(logPath)) } + + options = append(options, libpod.WithLogDriver(c.LogDriver)) + if c.IPAddress != "" { ip := net.ParseIP(c.IPAddress) if ip == nil { |