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/search.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/search.go')
| -rw-r--r-- | cmd/podman/search.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/search.go b/cmd/podman/search.go index 49b1b7f7b..fa11dad32 100644 --- a/cmd/podman/search.go +++ b/cmd/podman/search.go @@ -25,7 +25,7 @@ var ( searchFlags = []cli.Flag{ cli.StringFlag{ Name: "authfile", - Usage: "Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json", + Usage: "Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json. Use REGISTRY_AUTH_FILE environment variable to override. ", }, cli.StringSliceFlag{ Name: "filter, f", @@ -114,7 +114,7 @@ func searchCmd(c *cli.Context) error { noTrunc: c.Bool("no-trunc"), limit: c.Int("limit"), filter: c.StringSlice("filter"), - authfile: c.String("authfile"), + authfile: getAuthFile(c.String("authfile")), } regAndSkipTLS, err := getRegistriesAndSkipTLS(c, registry) if err != nil { |