opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-01 16:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

runtime.go: show search table in podman info

Browse Source 
Updates the podman info command to show registries from v1 config file
in the search table format.

Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>
This commit is contained in:
José Guilherme Vanz
2019-12-12 20:54:16 -03:00
parent 1b99651720
commit 95d26e3f6f
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libpod/runtime.go
View File

@ -692,13 +692,33 @@ func (r *Runtime) Info() ([]define.InfoData, error) {
info = append(info, define.InfoData{Type: "store", Data: storeInfo}) info = append(info, define.InfoData{Type: "store", Data: storeInfo})
registries := make(map[string]interface{}) registries := make(map[string]interface{})
regData, err := sysreg.GetRegistriesData() regs, err := sysreg.GetRegistries()
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error getting registries") return nil, errors.Wrapf(err, "error getting registries")
} }
for _, reg := range regData { if len(regs) > 0 {
// v1 config file. We should use the search table format
registries["search"] = regs
ireg, err := sysreg.GetInsecureRegistries()
if err != nil {
return nil, errors.Wrapf(err, "error getting registries")
}
registries["insecure"] = ireg
breg, err := sysreg.GetBlockedRegistries()
if err != nil {
return nil, errors.Wrapf(err, "error getting registries")
}
registries["blocked"] = breg
} else {
// v2 config file. We can show the whole registry data
data, err := sysreg.GetRegistriesData()
if err != nil {
return nil, errors.Wrapf(err, "error getting registries")
}
for _, reg := range data {
registries[reg.Prefix] = reg registries[reg.Prefix] = reg
} }
}
info = append(info, define.InfoData{Type: "registries", Data: registries}) info = append(info, define.InfoData{Type: "registries", Data: registries})
return info, nil return info, nil