opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 17:46:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix reporting the registries.conf path on error

Browse Source 
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>
This commit is contained in:
Miloslav Trmač
2018-12-03 22:59:04 +01:00
parent e885311641
commit 99d9626d71
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/image/pull.go
View File

@ -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 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 { if len(images) == 0 {
registryPath := sysregistries.RegistriesConfPath(&types.SystemContext{}) registryPath := sysregistries.RegistriesConfPath(&types.SystemContext{SystemRegistriesConfPath: systemRegistriesConfPath})
if goal.usedSearchRegistries && len(goal.searchedRegistries) == 0 { 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) return nil, errors.Errorf("image name provided is a short name and no search registries are defined in %s.", registryPath)
} }