diff options
| author | Qi Wang <qiwan@redhat.com> | 2019-04-25 13:28:07 -0400 |
|---|---|---|
| committer | Qi Wang <qiwan@redhat.com> | 2019-04-25 13:48:55 -0400 |
| commit | 6f08e6c3d12d0b4de2a1b9281042e6b3cce28733 (patch) | |
| tree | b297d8126fe06274bd6c920e3814d3e1e0cc0133 | |
| parent | d08efde586b18ed169da2502cc17b14b0497b08a (diff) | |
| download | podman-6f08e6c3d12d0b4de2a1b9281042e6b3cce28733.tar.gz podman-6f08e6c3d12d0b4de2a1b9281042e6b3cce28733.tar.bz2 podman-6f08e6c3d12d0b4de2a1b9281042e6b3cce28733.zip | |
fix login supports credHelpers config
Skip the error if login can't find credentials in credHelpers with credHelpers configed in auth.json and podman login will store the credentials in credHelpers later.
Signed-off-by: Qi Wang <qiwan@redhat.com>
| -rw-r--r-- | cmd/podman/login.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 589255683..6bf148cca 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -11,6 +11,7 @@ import ( "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod/image" + "github.com/docker/docker-credential-helpers/credentials" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" @@ -90,7 +91,8 @@ func loginCmd(c *cliconfig.LoginValues) error { // username of user logged in to server (if one exists) userFromAuthFile, passFromAuthFile, err := config.GetAuthentication(sc, server) - if err != nil { + // Do not return error if no credentials found in credHelpers, new credentials will be stored by config.SetAuthentication + if err != nil && err != credentials.NewErrCredentialsNotFound() { return errors.Wrapf(err, "error reading auth file") } |