summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-08-19 17:28:22 -0400
committerGitHub <noreply@github.com>2021-08-19 17:28:22 -0400
commit30b036c5d394bb523fa13074b1731ad4b6259693 (patch)
treefc06af62dcc0bae3c38a32ed444d458bd50e5958 /pkg
parentf988cfe1463f795f51f64e0887ba9dd9fe85b23d (diff)
parent16dfce486b45d5989dcba503cd0797bc7d66bee4 (diff)
downloadpodman-30b036c5d394bb523fa13074b1731ad4b6259693.tar.gz
podman-30b036c5d394bb523fa13074b1731ad4b6259693.tar.bz2
podman-30b036c5d394bb523fa13074b1731ad4b6259693.zip
Merge pull request #11280 from Luap99/info-plugins
Podman info output plugin information
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/info.go20
1 files changed, 12 insertions, 8 deletions
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
index d7cefd516..2c26c7bf8 100644
--- a/pkg/api/handlers/compat/info.go
+++ b/pkg/api/handlers/compat/info.go
@@ -102,14 +102,18 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
OomKillDisable: sysInfo.OomKillDisable,
OperatingSystem: infoData.Host.Distribution.Distribution,
PidsLimit: sysInfo.PidsLimit,
- Plugins: docker.PluginsInfo{},
- ProductLicense: "Apache-2.0",
- RegistryConfig: new(registry.ServiceConfig),
- RuncCommit: docker.Commit{},
- Runtimes: getRuntimes(configInfo),
- SecurityOptions: getSecOpts(sysInfo),
- ServerVersion: versionInfo.Version,
- SwapLimit: sysInfo.SwapLimit,
+ Plugins: docker.PluginsInfo{
+ Volume: infoData.Plugins.Volume,
+ Network: infoData.Plugins.Network,
+ Log: infoData.Plugins.Log,
+ },
+ ProductLicense: "Apache-2.0",
+ RegistryConfig: new(registry.ServiceConfig),
+ RuncCommit: docker.Commit{},
+ Runtimes: getRuntimes(configInfo),
+ SecurityOptions: getSecOpts(sysInfo),
+ ServerVersion: versionInfo.Version,
+ SwapLimit: sysInfo.SwapLimit,
Swarm: swarm.Info{
LocalNodeState: swarm.LocalNodeStateInactive,
},