diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-07-09 12:57:12 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-07-09 14:21:15 +0200 |
| commit | 714d36b0887158c7a951813b8d04739b354dd1c0 (patch) | |
| tree | 3af5564d48031e7ca1f076e7d95dbf2eae088280 /cmd/podman/shared/funcs.go | |
| parent | f7407f2eb512e1407f8281009eb829f37405119b (diff) | |
| download | podman-714d36b0887158c7a951813b8d04739b354dd1c0.tar.gz podman-714d36b0887158c7a951813b8d04739b354dd1c0.tar.bz2 podman-714d36b0887158c7a951813b8d04739b354dd1c0.zip | |
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 <gscrivan@redhat.com>
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 |