From 714d36b0887158c7a951813b8d04739b354dd1c0 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 9 Jul 2019 12:57:12 +0200 Subject: podman: create and run honors auth file location if the auth file was overriden, be sure create and run honors it. Closes: https://github.com/containers/libpod/issues/3524 Signed-off-by: Giuseppe Scrivano --- cmd/podman/shared/funcs.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'cmd/podman/shared/funcs.go') diff --git a/cmd/podman/shared/funcs.go b/cmd/podman/shared/funcs.go index c189cceeb..2ceb9cdcb 100644 --- a/cmd/podman/shared/funcs.go +++ b/cmd/podman/shared/funcs.go @@ -9,6 +9,21 @@ import ( "github.com/google/shlex" ) +func GetAuthFile(authfile string) string { + if authfile != "" { + return authfile + } + authfile = os.Getenv("REGISTRY_AUTH_FILE") + if authfile != "" { + return authfile + } + runtimeDir := os.Getenv("XDG_RUNTIME_DIR") + if runtimeDir != "" { + return filepath.Join(runtimeDir, "containers/auth.json") + } + return "" +} + func substituteCommand(cmd string) (string, error) { var ( newCommand string -- cgit v1.2.3-54-g00ecf