diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-06 03:20:16 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-06 03:20:16 -0500 |
| commit | 40678b119c0186bf7c56dc09d131e697c55cb9fd (patch) | |
| tree | dfb1cc13b0bdc1abad1ada51970bf0ac03d46810 /pkg/registries/registries.go | |
| parent | dcb68d1aa24b2dd00d793f5a66f96cc5403b43c3 (diff) | |
| parent | 75b19ca8abe1957f3c48035767960a6b20c10519 (diff) | |
| download | podman-40678b119c0186bf7c56dc09d131e697c55cb9fd.tar.gz podman-40678b119c0186bf7c56dc09d131e697c55cb9fd.tar.bz2 podman-40678b119c0186bf7c56dc09d131e697c55cb9fd.zip | |
Merge branch 'master' of github.com:containers/libpod into vendor
Diffstat (limited to 'pkg/registries/registries.go')
| -rw-r--r-- | pkg/registries/registries.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index 73aa93d68..c26f15cb6 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -38,8 +38,10 @@ func GetRegistries() ([]string, error) { func GetInsecureRegistries() ([]string, error) { registryConfigPath := "" - if _, err := os.Stat(userRegistriesFile); err == nil { - registryConfigPath = userRegistriesFile + if rootless.IsRootless() { + if _, err := os.Stat(userRegistriesFile); err == nil { + registryConfigPath = userRegistriesFile + } } envOverride := os.Getenv("REGISTRIES_CONFIG_PATH") |