diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-08 07:59:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-09 14:02:06 +0000 |
| commit | c7424b69911222c2dc92a41308685f1e6d36fb53 (patch) | |
| tree | dd3b5a75198a72653973566dcf15ad0b55f367d4 /vendor/github.com/projectatomic/buildah/util.go | |
| parent | f661e1d21d5f22d889842642dbd612ead54a7612 (diff) | |
| download | podman-c7424b69911222c2dc92a41308685f1e6d36fb53.tar.gz podman-c7424b69911222c2dc92a41308685f1e6d36fb53.tar.bz2 podman-c7424b69911222c2dc92a41308685f1e6d36fb53.zip | |
Vendor in latest buildah to add masks for /proc/keys and /proc/acpi
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1062
Approved by: baude
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/util.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/util.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vendor/github.com/projectatomic/buildah/util.go b/vendor/github.com/projectatomic/buildah/util.go index 3e86d8c0e..4aa19b384 100644 --- a/vendor/github.com/projectatomic/buildah/util.go +++ b/vendor/github.com/projectatomic/buildah/util.go @@ -167,13 +167,8 @@ func (b *Builder) tarPath() func(path string) (io.ReadCloser, error) { } // getRegistries obtains the list of registries defined in the global registries file. -func getRegistries() ([]string, error) { - registryConfigPath := "" - envOverride := os.Getenv("REGISTRIES_CONFIG_PATH") - if len(envOverride) > 0 { - registryConfigPath = envOverride - } - searchRegistries, err := sysregistries.GetRegistries(&types.SystemContext{SystemRegistriesConfPath: registryConfigPath}) +func getRegistries(sc *types.SystemContext) ([]string, error) { + searchRegistries, err := sysregistries.GetRegistries(sc) if err != nil { return nil, errors.Wrapf(err, "unable to parse the registries.conf file") } |