diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2019-06-03 15:32:39 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2019-06-14 15:45:41 +0200 |
| commit | 5fde3361da51f5c835eae68baa96ae32a7e48925 (patch) | |
| tree | 8ef2ee263d48d5dfb32845c0fa8d11b864d87eba /pkg/registries | |
| parent | d5f04e920bf0cca02c9efe25ceca7639cbf31644 (diff) | |
| download | podman-5fde3361da51f5c835eae68baa96ae32a7e48925.tar.gz podman-5fde3361da51f5c835eae68baa96ae32a7e48925.tar.bz2 podman-5fde3361da51f5c835eae68baa96ae32a7e48925.zip | |
Update containers/image to v2.0.0, and buildah to v1.8.4
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č <mitr@redhat.com>
Diffstat (limited to 'pkg/registries')
| -rw-r--r-- | pkg/registries/registries.go | 12 |
1 files changed, 1 insertions, 11 deletions
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. |