diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-12 07:54:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 07:54:13 -0700 |
| commit | 9a933c70b1cf60c48211bc700d726074aa4536a0 (patch) | |
| tree | 59b86e95fccb21f26591177747adfcffa6816f85 /cmd/podman/common.go | |
| parent | da5c89497f9d6ee5cb6e826d7db7cca5686ab4f7 (diff) | |
| parent | 88673a5fcfcedb3ab3f1039a46b3eba912f35e5c (diff) | |
| download | podman-9a933c70b1cf60c48211bc700d726074aa4536a0.tar.gz podman-9a933c70b1cf60c48211bc700d726074aa4536a0.tar.bz2 podman-9a933c70b1cf60c48211bc700d726074aa4536a0.zip | |
Merge pull request #1611 from QiWang19/issue1340
Support auth file environment variable in related podman commands & add change to man pages
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 1e7f8d4d8..e342659ed 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -458,3 +458,10 @@ func sortFlags(flags []cli.Flag) []cli.Flag { }) return flags } + +func getAuthFile(authfile string) string { + if authfile != "" { + return authfile + } + return os.Getenv("REGISTRY_AUTH_FILE") +} |