From 4f9672e94c16793b68fc40a82132e7b2e6dc06c2 Mon Sep 17 00:00:00 2001 From: José Guilherme Vanz Date: Thu, 12 Dec 2019 19:53:46 -0300 Subject: podman: mirror information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the podman info command to show the mirror information Issue https://github.com/containers/libpod/issues/4553 Signed-off-by: José Guilherme Vanz --- libpod/runtime.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'libpod') diff --git a/libpod/runtime.go b/libpod/runtime.go index 3873079ce..c1b523cdf 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -691,24 +691,15 @@ func (r *Runtime) Info() ([]define.InfoData, error) { } info = append(info, define.InfoData{Type: "store", Data: storeInfo}) - reg, err := sysreg.GetRegistries() - if err != nil { - return nil, errors.Wrapf(err, "error getting registries") - } registries := make(map[string]interface{}) - registries["search"] = reg - - ireg, err := sysreg.GetInsecureRegistries() + regData, err := sysreg.GetRegistriesData() 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") + for _, reg := range regData { + registries[reg.Prefix] = reg } - registries["blocked"] = breg + info = append(info, define.InfoData{Type: "registries", Data: registries}) return info, nil } -- cgit v1.2.3-54-g00ecf