summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-02-28 14:13:28 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-28 21:26:46 +0000
commitfd388a7da984f824cf976f090a9e3eb61c303b87 (patch)
tree19f7247e5f0e1ad850cb796ea637ed7d2ecf91f9
parent3d5cb8e2231b9eb12c5f136989e336c2e4a199c3 (diff)
downloadpodman-fd388a7da984f824cf976f090a9e3eb61c303b87.tar.gz
podman-fd388a7da984f824cf976f090a9e3eb61c303b87.tar.bz2
podman-fd388a7da984f824cf976f090a9e3eb61c303b87.zip
podman info add registries
add registries and insecure registries to the podman info output. this gives us some capatibility with other container runtimes. Resolves issue #420 Signed-off-by: baude <bbaude@redhat.com> Closes: #422 Approved by: mheon
-rw-r--r--libpod/runtime.go15
1 files changed, 15 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 552a4efc8..c833f2300 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -392,5 +392,20 @@ func (r *Runtime) Info() ([]InfoData, error) {
}
info = append(info, InfoData{Type: "store", Data: storeInfo})
+ reg, err := GetRegistries()
+ if err != nil {
+ return nil, errors.Wrapf(err, "error getting registries")
+ }
+ registries := make(map[string]interface{})
+ registries["registries"] = reg
+ info = append(info, InfoData{Type: "registries", Data: registries})
+
+ i, err := GetInsecureRegistries()
+ if err != nil {
+ return nil, errors.Wrapf(err, "error getting registries")
+ }
+ insecureRegistries := make(map[string]interface{})
+ insecureRegistries["registries"] = i
+ info = append(info, InfoData{Type: "insecure registries", Data: insecureRegistries})
return info, nil
}