opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7729 from mheon/info_cgroup_manager

Browse Source 
Include cgroup manager in `podman info` output
This commit is contained in:
OpenShift Merge Robot
2020-09-22 21:00:57 +00:00
committed by GitHub
parent a8917996c4 99386c7ae7
commit 2270be1871
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libpod/define/info.go
View File

@ -15,6 +15,7 @@ type Info struct {
type HostInfo struct { type HostInfo struct {
Arch string `json:"arch"` Arch string `json:"arch"`
BuildahVersion string `json:"buildahVersion"` BuildahVersion string `json:"buildahVersion"`
CgroupManager string `json:"cgroupManager"`
CGroupsVersion string `json:"cgroupVersion"` CGroupsVersion string `json:"cgroupVersion"`
Conmon *ConmonInfo `json:"conmon"` Conmon *ConmonInfo `json:"conmon"`
CPUs int `json:"cpus"` CPUs int `json:"cpus"`

1
libpod/info.go
View File

@ -87,6 +87,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
info := define.HostInfo{ info := define.HostInfo{
Arch: runtime.GOARCH, Arch: runtime.GOARCH,
BuildahVersion: buildah.Version, BuildahVersion: buildah.Version,
CgroupManager: r.config.Engine.CgroupManager,
Linkmode: linkmode.Linkmode(), Linkmode: linkmode.Linkmode(),
CPUs: runtime.NumCPU(), CPUs: runtime.NumCPU(),
Distribution: hostDistributionInfo, Distribution: hostDistributionInfo,

2
test/system/005-info.bats
View File

@ -19,6 +19,8 @@ graphRoot:
graphStatus: graphStatus:
imageStore:\\\s\\\+number: 1 imageStore:\\\s\\\+number: 1
runRoot: runRoot:
cgroupManager:
cgroupVersion: v
" "
while read expect; do while read expect; do
is "$output" ".*$expect" "output includes '$expect'" is "$output" ".*$expect" "output includes '$expect'"