aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-12-17 14:05:15 +0100
committerGitHub <noreply@github.com>2019-12-17 14:05:15 +0100
commit1e440a3a3f7c7a1ac5896ae834e884c0dc3907f3 (patch)
tree7d47b76e16325f841ea729e203519bbf2b0a0707 /pkg
parent43292040ab6841779def4872a4c337a77b05bfa0 (diff)
parent40f4a00eb344ad3848c5e84bffd8c2061311f0a9 (diff)
downloadpodman-1e440a3a3f7c7a1ac5896ae834e884c0dc3907f3.tar.gz
podman-1e440a3a3f7c7a1ac5896ae834e884c0dc3907f3.tar.bz2
podman-1e440a3a3f7c7a1ac5896ae834e884c0dc3907f3.zip
Merge pull request #4681 from jvanz/issue4553
podman: mirror information
Diffstat (limited to 'pkg')
-rw-r--r--pkg/registries/registries.go7
1 files changed, 4 insertions, 3 deletions
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
}