diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-09 15:33:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-09 15:33:16 +0200 |
| commit | eb4b7ed12bd831ac14cc6a6eea542d61900cb159 (patch) | |
| tree | c04f7b650786cea74cb72de19927e8016e01598d /cmd/podman/shared/funcs.go | |
| parent | cea0e93a658f10cc46b56cb9b00ac8b824bc8b02 (diff) | |
| parent | 714d36b0887158c7a951813b8d04739b354dd1c0 (diff) | |
| download | podman-eb4b7ed12bd831ac14cc6a6eea542d61900cb159.tar.gz podman-eb4b7ed12bd831ac14cc6a6eea542d61900cb159.tar.bz2 podman-eb4b7ed12bd831ac14cc6a6eea542d61900cb159.zip | |
Merge pull request #3528 from giuseppe/fix-auth-location
podman: create and run honors auth file location
Diffstat (limited to 'cmd/podman/shared/funcs.go')
| -rw-r--r-- | cmd/podman/shared/funcs.go | 15 |
1 files changed, 15 insertions, 0 deletions
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 |