opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 02:58:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Vendor in latest buildah to add masks for /proc/keys and /proc/acpi

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1062
Approved by: baude
This commit is contained in:
Daniel J Walsh
2018-07-08 07:59:35 -04:00
committed by Atomic Bot
parent f661e1d21d
commit c7424b6991
7 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vendor/github.com/projectatomic/buildah/util.go generated vendored
View File

@@ -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")
}