diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-20 12:29:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 12:29:04 -0400 |
| commit | d433e5612409f9e2207b11b017b1101631a7971b (patch) | |
| tree | 7e198c5a0b9f07a1dc8537b5f172aee54563832a /libpod | |
| parent | ba1871dac033783ab0329c9b3c9113a34a90992f (diff) | |
| parent | d4f14be3a7aa7b5b884906d764db3214e51b3e67 (diff) | |
| download | podman-d433e5612409f9e2207b11b017b1101631a7971b.tar.gz podman-d433e5612409f9e2207b11b017b1101631a7971b.tar.bz2 podman-d433e5612409f9e2207b11b017b1101631a7971b.zip | |
Merge pull request #1099 from giuseppe/per-user-conf-files
rootless: allow to override configuration files
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/image/pull.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go index a5a398eb1..f12c1ae5f 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "os" "strings" cp "github.com/containers/image/copy" @@ -277,12 +276,7 @@ func (i *Image) createNamesToPull() ([]*pullStruct, error) { pullNames = append(pullNames, &ps) } else { - registryConfigPath := "" - envOverride := os.Getenv("REGISTRIES_CONFIG_PATH") - if len(envOverride) > 0 { - registryConfigPath = envOverride - } - searchRegistries, err := sysregistries.GetRegistries(&types.SystemContext{SystemRegistriesConfPath: registryConfigPath}) + searchRegistries, err := registries.GetRegistries() if err != nil { return nil, err } |