Merge pull request #3760 from rhatdan/auth

Use GetRuntimeDir to setup auth.json for login

2 files changed, 6 insertions, 4 deletions

diff --git a/cmd/podman/shared/funcs.go b/cmd/podman/shared/funcs.go
index 2ceb9cdcb..bb4eed1e3 100644
--- a/cmd/podman/shared/funcs.go
+++ b/cmd/podman/shared/funcs.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/libpod/pkg/util"
 	"github.com/google/shlex"
 )
 
@@ -13,13 +14,14 @@ 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")
+
+	if runtimeDir, err := util.GetRuntimeDir(); err == nil {
+		return filepath.Join(runtimeDir, "auth.json")
 	}
 	return ""
 }
diff --git a/cmd/podman/varlink.go b/cmd/podman/varlink.go
index 5f89534be..cd21e3574 100644
--- a/cmd/podman/varlink.go
+++ b/cmd/podman/varlink.go
@@ -53,7 +53,7 @@ func init() {
 func varlinkCmd(c *cliconfig.VarlinkValues) error {
 	varlinkURI := adapter.DefaultAddress
 	if rootless.IsRootless() {
-		xdg, err := util.GetRootlessRuntimeDir()
+		xdg, err := util.GetRuntimeDir()
 		if err != nil {
 			return err
 		}