diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-06 11:35:29 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-07 14:16:26 +0000 |
| commit | 33d6221ae34103d68753156ff2638802817dfa16 (patch) | |
| tree | 11ed782c99565d37e33a178bf2da627ea1b33a77 /libpod/info.go | |
| parent | b1de943eea26bf1f6a6c599116cba3e7d9fe5d36 (diff) | |
| download | podman-33d6221ae34103d68753156ff2638802817dfa16.tar.gz podman-33d6221ae34103d68753156ff2638802817dfa16.tar.bz2 podman-33d6221ae34103d68753156ff2638802817dfa16.zip | |
Have info print conmon/oci runtime information
We need into to identify the OCI runtime and conmon used by podman.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1224
Approved by: baude
Diffstat (limited to 'libpod/info.go')
| -rw-r--r-- | libpod/info.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libpod/info.go b/libpod/info.go index fe422747c..5bb77f447 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -37,6 +37,18 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) { info["MemFree"] = mi.MemFree info["SwapTotal"] = mi.SwapTotal info["SwapFree"] = mi.SwapFree + conmonVersion, _ := r.GetConmonVersion() + ociruntimeVersion, _ := r.GetOCIRuntimeVersion() + info["Conmon"] = map[string]interface{}{ + "path": r.conmonPath, + "package": r.ociRuntime.conmonPackage(), + "version": conmonVersion, + } + info["OCIRuntime"] = map[string]interface{}{ + "path": r.ociRuntime.path, + "package": r.ociRuntime.pathPackage(), + "version": ociruntimeVersion, + } kv, err := readKernelVersion() if err != nil { @@ -86,11 +98,6 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) { } info["hostname"] = host - // Don't think this should be catastrophic if we cannot get the versions - conmonVersion, _ := r.GetConmonVersion() - ociruntimeVersion, _ := r.GetOCIRuntimeVersion() - info["conmonVersion"] = conmonVersion - info["OCIRuntimeVersion"] = ociruntimeVersion return info, nil } |