From 99d9626d71dd47ab8f2588fec65addb5389e23c3 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Mon, 3 Dec 2018 22:59:04 +0100 Subject: Fix reporting the registries.conf path on error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i.e. actually reflect the environment variable and/or rootless mode instead of always using the default path. Signed-off-by: Miloslav Trmač --- libpod/image/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod/image') 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) } -- cgit v1.2.3-54-g00ecf