podman: mirror information

Updates the podman info command to show the mirror information

Issue https://github.com/containers/libpod/issues/4553

Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>

2 files changed, 8 insertions, 16 deletions

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
 }
diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go
index 9643c947f..ba7de7cf9 100644
--- a/pkg/registries/registries.go
+++ b/pkg/registries/registries.go
@@ -34,7 +34,8 @@ func SystemRegistriesConfPath() string {
 	return ""
 }
 
-func getRegistries() ([]sysregistriesv2.Registry, error) {
+// GetRegistriesData obtains the list of registries
+func GetRegistriesData() ([]sysregistriesv2.Registry, error) {
 	registries, err := sysregistriesv2.GetRegistries(&types.SystemContext{SystemRegistriesConfPath: SystemRegistriesConfPath()})
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to parse the registries.conf file")
@@ -50,7 +51,7 @@ func GetRegistries() ([]string, error) {
 // GetBlockedRegistries obtains the list of blocked registries defined in the global registries file.
 func GetBlockedRegistries() ([]string, error) {
 	var blockedRegistries []string
-	registries, err := getRegistries()
+	registries, err := GetRegistriesData()
 	if err != nil {
 		return nil, err
 	}
@@ -65,7 +66,7 @@ func GetBlockedRegistries() ([]string, error) {
 // GetInsecureRegistries obtains the list of insecure registries from the global registration file.
 func GetInsecureRegistries() ([]string, error) {
 	var insecureRegistries []string
-	registries, err := getRegistries()
+	registries, err := GetRegistriesData()
 	if err != nil {
 		return nil, err
 	}