diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-05-20 10:56:00 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-05-20 13:39:40 -0400 |
| commit | 1d505f6875d27dccafb777853a51045f82888f00 (patch) | |
| tree | 25c97e90fecfdd106204c051e254df5509ce8676 /pkg | |
| parent | 18a953918e1d15aded713f9802865807bd25a1e0 (diff) | |
| download | podman-1d505f6875d27dccafb777853a51045f82888f00.tar.gz podman-1d505f6875d27dccafb777853a51045f82888f00.tar.bz2 podman-1d505f6875d27dccafb777853a51045f82888f00.zip | |
Update vendor of buildah and containers/images
Mainly add support for podman build using --overlay mounts.
Updates containers/image also adds better support for new registries.conf
file.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/registries/registries.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index fdb7f33c5..5c4ecd020 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -51,7 +51,7 @@ func GetRegistries() ([]string, error) { } for _, reg := range registries { if reg.Search { - searchRegistries = append(searchRegistries, reg.URL) + searchRegistries = append(searchRegistries, reg.Location) } } return searchRegistries, nil @@ -66,7 +66,7 @@ func GetBlockedRegistries() ([]string, error) { } for _, reg := range registries { if reg.Blocked { - blockedRegistries = append(blockedRegistries, reg.URL) + blockedRegistries = append(blockedRegistries, reg.Location) } } return blockedRegistries, nil @@ -81,7 +81,7 @@ func GetInsecureRegistries() ([]string, error) { } for _, reg := range registries { if reg.Insecure { - insecureRegistries = append(insecureRegistries, reg.URL) + insecureRegistries = append(insecureRegistries, reg.Location) } } return insecureRegistries, nil |