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 /vendor | |
| 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 'vendor')
| -rw-r--r-- | vendor/github.com/containers/buildah/pkg/cli/common.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/containers/buildah/pkg/cli/common.go b/vendor/github.com/containers/buildah/pkg/cli/common.go index b54663f5d..4baf0da69 100644 --- a/vendor/github.com/containers/buildah/pkg/cli/common.go +++ b/vendor/github.com/containers/buildah/pkg/cli/common.go @@ -83,7 +83,7 @@ var ( }, 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: "build-arg", |