summaryrefslogtreecommitdiff
path: root/cmd/podman/shared
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-11 18:08:25 +0200
committerGitHub <noreply@github.com>2019-10-11 18:08:25 +0200
commit50b18847a6cdd91cd5a67beab2072534dcc59eb7 (patch)
treeb188a5ecf916d5047e26a371b7ade02107b76a0a /cmd/podman/shared
parent9f1f4ef19e2d15ad453c6c3ac4e00e53bd36eb0d (diff)
parentf4c7a66149a33865684a759311628a87230eea09 (diff)
downloadpodman-50b18847a6cdd91cd5a67beab2072534dcc59eb7.tar.gz
podman-50b18847a6cdd91cd5a67beab2072534dcc59eb7.tar.bz2
podman-50b18847a6cdd91cd5a67beab2072534dcc59eb7.zip
Merge pull request #4232 from csomh/auth-file-path
Fix default path for auth.json
Diffstat (limited to 'cmd/podman/shared')
-rw-r--r--cmd/podman/shared/funcs.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/shared/funcs.go b/cmd/podman/shared/funcs.go
index bb4eed1e3..9362e8e9b 100644
--- a/cmd/podman/shared/funcs.go
+++ b/cmd/podman/shared/funcs.go
@@ -21,7 +21,7 @@ func GetAuthFile(authfile string) string {
}
if runtimeDir, err := util.GetRuntimeDir(); err == nil {
- return filepath.Join(runtimeDir, "auth.json")
+ return filepath.Join(runtimeDir, "containers/auth.json")
}
return ""
}