containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22177 from mheon/fix_22172 

Add rootless network command to `podman info`
This commit is contained in:
openshift-merge-bot[bot] 2024-03-26 17:15:53 +00:00 committed by GitHub
parent 5c39ddca5d b56331cd2f
commit 25ebf10967
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/define/info.go
View File

@ -52,6 +52,8 @@ type HostInfo struct {
OS string `json:"os"` OS string `json:"os"`
// RemoteSocket returns the UNIX domain socket the Podman service is listening on // RemoteSocket returns the UNIX domain socket the Podman service is listening on
RemoteSocket *RemoteSocket `json:"remoteSocket,omitempty"` RemoteSocket *RemoteSocket `json:"remoteSocket,omitempty"`
// RootlessNetworkCmd returns the default rootless network command (slirp4netns or pasta)
RootlessNetworkCmd string `json:"rootlessNetworkCmd"`
RuntimeInfo map[string]interface{} `json:"runtimeInfo,omitempty"` RuntimeInfo map[string]interface{} `json:"runtimeInfo,omitempty"`
// ServiceIsRemote is true when the podman/libpod service is remote to the client // ServiceIsRemote is true when the podman/libpod service is remote to the client
ServiceIsRemote bool `json:"serviceIsRemote"` ServiceIsRemote bool `json:"serviceIsRemote"`

1
libpod/info.go
View File

@ -126,6 +126,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
NetworkBackend: r.config.Network.NetworkBackend, NetworkBackend: r.config.Network.NetworkBackend,
NetworkBackendInfo: r.network.NetworkInfo(), NetworkBackendInfo: r.network.NetworkInfo(),
OS: runtime.GOOS, OS: runtime.GOOS,
RootlessNetworkCmd: r.config.Network.DefaultRootlessNetworkCmd,
SwapFree: mi.SwapFree, SwapFree: mi.SwapFree,
SwapTotal: mi.SwapTotal, SwapTotal: mi.SwapTotal,
} }

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

@ -47,6 +47,7 @@ host.cgroupVersion | v[12]
host.networkBackendInfo | .*dns.*package.* host.networkBackendInfo | .*dns.*package.*
host.ociRuntime.path | $expr_path host.ociRuntime.path | $expr_path
host.pasta | .*executable.*package.* host.pasta | .*executable.*package.*
host.rootlessNetworkCmd | pasta
store.configFile | $expr_path store.configFile | $expr_path
store.graphDriverName | [a-z0-9]\\\+\\\$ store.graphDriverName | [a-z0-9]\\\+\\\$
store.graphRoot | $expr_path store.graphRoot | $expr_path