From 5fde3361da51f5c835eae68baa96ae32a7e48925 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Mon, 3 Jun 2019 15:32:39 +0200 Subject: Update containers/image to v2.0.0, and buildah to v1.8.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In c/image, this adds the the mirror-by-digest-only option to mirrors, and moves the search order to an independent list. A synchronized buildah update is necessary to deal with the c/image API change. Signed-off-by: Miloslav Trmač --- pkg/registries/registries.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'pkg') diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index 5c4ecd020..92fa1e71f 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -44,17 +44,7 @@ func getRegistries() ([]sysregistriesv2.Registry, error) { // GetRegistries obtains the list of search registries defined in the global registries file. func GetRegistries() ([]string, error) { - var searchRegistries []string - registries, err := getRegistries() - if err != nil { - return nil, err - } - for _, reg := range registries { - if reg.Search { - searchRegistries = append(searchRegistries, reg.Location) - } - } - return searchRegistries, nil + return sysregistriesv2.UnqualifiedSearchRegistries(&types.SystemContext{SystemRegistriesConfPath: SystemRegistriesConfPath()}) } // GetBlockedRegistries obtains the list of blocked registries defined in the global registries file. -- cgit v1.2.3-54-g00ecf From 2be01ea4fb2aa18d83c04a5acc607bb398546f4c Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Mon, 3 Jun 2019 15:40:31 +0200 Subject: Use the logical registry location instead of the physical one in (podman info) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miloslav Trmač --- pkg/registries/registries.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index 92fa1e71f..de63dcbf1 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -56,7 +56,7 @@ func GetBlockedRegistries() ([]string, error) { } for _, reg := range registries { if reg.Blocked { - blockedRegistries = append(blockedRegistries, reg.Location) + blockedRegistries = append(blockedRegistries, reg.Prefix) } } return blockedRegistries, nil @@ -71,7 +71,7 @@ func GetInsecureRegistries() ([]string, error) { } for _, reg := range registries { if reg.Insecure { - insecureRegistries = append(insecureRegistries, reg.Location) + insecureRegistries = append(insecureRegistries, reg.Prefix) } } return insecureRegistries, nil -- cgit v1.2.3-54-g00ecf