summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-07-16 12:13:24 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-07-20 11:00:51 +0200
commit06a5cc41bfe816312b02fd96ecb175a7196b2b1d (patch)
tree38055630b501feb8985ce29aa51f9878d37e26d8
parent067ae3109516da042f0322d158ef1228bf7763bb (diff)
downloadpodman-06a5cc41bfe816312b02fd96ecb175a7196b2b1d.tar.gz
podman-06a5cc41bfe816312b02fd96ecb175a7196b2b1d.tar.bz2
podman-06a5cc41bfe816312b02fd96ecb175a7196b2b1d.zip
pull: get registries using the registries pkg
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--libpod/image/pull.go8
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
}