X Tutup
Skip to content

[18.06] backport credential-helper fixes#1184

Merged
silvin-lubecki merged 2 commits intodocker:18.06from
thaJeztah:18.06-backport-credentials
Jul 5, 2018
Merged

[18.06] backport credential-helper fixes#1184
silvin-lubecki merged 2 commits intodocker:18.06from
thaJeztah:18.06-backport-credentials

Conversation

@thaJeztah
Copy link
Member

Cherry-pick for 18.06 of;

Resolves #699

no conflicts, cherry-pick was clean

ping @euank @vdemeester @n4ss PTAL

vdemeester and others added 2 commits July 4, 2018 00:51
This is mainly for the `pass` helper ; `pass` shouldn't be called
every docker command anymore ;).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit d9741fc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
'CheckInitialized' in the credential-helper library actually invokes
`pass`, which isn't desirable (see docker#699).

This moves the check to be simpler, and then pass will only be invoked
when it's needed (such as for `docker login` or when pulling from a
private registry).

This logic could also reasonably live in the credential-helper library,
but it's simple enough it seems fine in either location.

Signed-off-by: Euan Kemp <euank@euank.com>
(cherry picked from commit 056015c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@silvin-lubecki silvin-lubecki merged commit 5f42140 into docker:18.06 Jul 5, 2018
@thaJeztah thaJeztah deleted the 18.06-backport-credentials branch July 5, 2018 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

X Tutup