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 ++++------------- pkg/registries/registries.go | 7 ++++--- 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 } -- cgit v1.2.3-54-g00ecf From 1b99651720fd46872a21cda3aebbb6ee7ac83c85 Mon Sep 17 00:00:00 2001 From: José Guilherme Vanz Date: Thu, 12 Dec 2019 08:21:31 -0300 Subject: podman info man: example update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the command output example to show information about registries and their mirrors Signed-off-by: José Guilherme Vanz --- docs/source/markdown/podman-info.1.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/docs/source/markdown/podman-info.1.md b/docs/source/markdown/podman-info.1.md index 9721755ef..b539f1d3c 100644 --- a/docs/source/markdown/podman-info.1.md +++ b/docs/source/markdown/podman-info.1.md @@ -53,13 +53,26 @@ host: os: linux uptime: 218h 49m 33.66s (Approximately 9.08 days) registries: - blocked: null - insecure: null - search: - - quay.io - - registry.fedoraproject.org - - docker.io - - registry.redhat.io + docker.io: + Blocked: true + Insecure: true + Location: docker.io + MirrorByDigestOnly: false + Mirrors: + - Insecure: true + Location: example2.io/example/ubi8-minimal + Prefix: docker.io + redhat.com: + Blocked: false + Insecure: false + Location: registry.access.redhat.com/ubi8 + MirrorByDigestOnly: true + Mirrors: + - Insecure: false + Location: example.io/example/ubi8-minimal + - Insecure: true + Location: example3.io/example/ubi8-minimal + Prefix: redhat.com store: ConfigFile: /etc/containers/storage.conf ContainerStore: -- cgit v1.2.3-54-g00ecf From 95d26e3f6f1b089968ea1eacf7c5af538ef27955 Mon Sep 17 00:00:00 2001 From: José Guilherme Vanz Date: Thu, 12 Dec 2019 20:54:16 -0300 Subject: runtime.go: show search table in podman info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the podman info command to show registries from v1 config file in the search table format. Signed-off-by: José Guilherme Vanz --- libpod/runtime.go | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/libpod/runtime.go b/libpod/runtime.go index c1b523cdf..5397e51f5 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -692,12 +692,32 @@ func (r *Runtime) Info() ([]define.InfoData, error) { info = append(info, define.InfoData{Type: "store", Data: storeInfo}) registries := make(map[string]interface{}) - regData, err := sysreg.GetRegistriesData() + regs, err := sysreg.GetRegistries() if err != nil { return nil, errors.Wrapf(err, "error getting registries") } - for _, reg := range regData { - registries[reg.Prefix] = reg + 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 + } } info = append(info, define.InfoData{Type: "registries", Data: registries}) -- cgit v1.2.3-54-g00ecf From 40f4a00eb344ad3848c5e84bffd8c2061311f0a9 Mon Sep 17 00:00:00 2001 From: José Guilherme Vanz Date: Fri, 13 Dec 2019 11:06:10 -0300 Subject: runtime.go: show registries data and search table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update podman info command to show the registries data and the search table. Signed-off-by: José Guilherme Vanz --- libpod/runtime.go | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/libpod/runtime.go b/libpod/runtime.go index 5397e51f5..001d850b0 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -692,32 +692,19 @@ func (r *Runtime) Info() ([]define.InfoData, error) { info = append(info, define.InfoData{Type: "store", Data: storeInfo}) registries := make(map[string]interface{}) + data, err := sysreg.GetRegistriesData() + if err != nil { + return nil, errors.Wrapf(err, "error getting registries") + } + for _, reg := range data { + registries[reg.Prefix] = reg + } regs, err := sysreg.GetRegistries() if err != nil { return nil, errors.Wrapf(err, "error getting registries") } 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 - } } info = append(info, define.InfoData{Type: "registries", Data: registries}) -- cgit v1.2.3-54-g00ecf