summaryrefslogtreecommitdiff
path: root/libpod/image/pull.go
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2018-12-03 22:59:04 +0100
committerMiloslav Trmač <mitr@redhat.com>2018-12-06 23:34:59 +0100
commit99d9626d71dd47ab8f2588fec65addb5389e23c3 (patch)
treef0da3587e2fb813056d7212d1b6fc513076c8815 /libpod/image/pull.go
parente885311641846fca2ad99f5f54014f7ec104fe15 (diff)
downloadpodman-99d9626d71dd47ab8f2588fec65addb5389e23c3.tar.gz
podman-99d9626d71dd47ab8f2588fec65addb5389e23c3.tar.bz2
podman-99d9626d71dd47ab8f2588fec65addb5389e23c3.zip
Fix reporting the registries.conf path on error
i.e. actually reflect the environment variable and/or rootless mode instead of always using the default path. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'libpod/image/pull.go')
-rw-r--r--libpod/image/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index bd1377eba..09935fe7c 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -254,7 +254,7 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa
}
// If no image was found, we should handle. Lets be nicer to the user and see if we can figure out why.
if len(images) == 0 {
- registryPath := sysregistries.RegistriesConfPath(&types.SystemContext{})
+ registryPath := sysregistries.RegistriesConfPath(&types.SystemContext{SystemRegistriesConfPath: systemRegistriesConfPath})
if goal.usedSearchRegistries && len(goal.searchedRegistries) == 0 {
return nil, errors.Errorf("image name provided is a short name and no search registries are defined in %s.", registryPath)
}