diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-08-14 12:06:09 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-15 11:40:30 +0000 |
| commit | e2b96e96f93d1da17b817eaa960b9d809bc61a14 (patch) | |
| tree | 9dbf734f5f2021889666da7a738792635f2bf520 /vendor/github.com/projectatomic/buildah/util | |
| parent | cd7102a70e7f3555df832c4c1bcf958e121cbf4d (diff) | |
| download | podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.tar.gz podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.tar.bz2 podman-e2b96e96f93d1da17b817eaa960b9d809bc61a14.zip | |
vendor: update buildah version
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #1269
Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/util')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/util/util.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vendor/github.com/projectatomic/buildah/util/util.go b/vendor/github.com/projectatomic/buildah/util/util.go index 2617a27b7..1e7361462 100644 --- a/vendor/github.com/projectatomic/buildah/util/util.go +++ b/vendor/github.com/projectatomic/buildah/util/util.go @@ -15,7 +15,7 @@ import ( dockerarchive "github.com/containers/image/docker/archive" "github.com/containers/image/docker/reference" ociarchive "github.com/containers/image/oci/archive" - "github.com/containers/image/pkg/sysregistries" + "github.com/containers/image/pkg/sysregistriesv2" "github.com/containers/image/signature" is "github.com/containers/image/storage" "github.com/containers/image/tarball" @@ -114,11 +114,17 @@ func ResolveName(name string, firstRegistry string, sc *types.SystemContext, sto } // Figure out the list of registries. - registries, err := sysregistries.GetRegistries(sc) + var registries []string + allRegistries, err := sysregistriesv2.GetRegistries(sc) if err != nil { logrus.Debugf("unable to read configured registries to complete %q: %v", name, err) registries = []string{} } + for _, registry := range sysregistriesv2.FindUnqualifiedSearchRegistries(allRegistries) { + if !registry.Blocked { + registries = append(registries, registry.URL) + } + } // Create all of the combinations. Some registries need an additional component added, so // use our lookaside map to keep track of them. If there are no configured registries, we'll |