Skip to content
This repository has been archived by the owner on Mar 21, 2022. It is now read-only.

integrate revamped authentication support from docker-client #339

Merged
merged 3 commits into from
Jun 7, 2017

Conversation

mattnworb
Copy link
Member

@mattnworb mattnworb commented Jun 7, 2017

This largely mirrors changes done in dockerfile-maven to integrate the
new authentication support from docker-client.

The plugin now loads credentials from three places, in order:

  1. Any credentials stored in ~/.dockercfg or ~/.docker/config.json

  2. (Optional) Google Cloud credentials, either loaded through the
    DOCKER_GOOGLE_CREDENTIALS environment variable or Google's automatic
    resolution process for credentials

  3. Last precedence is given to any explicitly configured credentials in
    the plugin's configuration.

The useConfigFile parameter is no longer used as authentication info
from the docker configuration file is always activated.

One of the big motivations of the revamped authentication support in
docker-client was to address long-standing issues in this plugin in
regards to being able to authenticate against multiple registries, as
the previous implementation assumed that the same credentials would be
used for any possible registry.

Closes #326, #284, #252, and probably more.

For more reference see:

@mattnworb mattnworb requested review from davidxia and caipre June 7, 2017 00:39
@mattnworb
Copy link
Member Author

@davidxia @caipre @mavenraven

mattnworb added a commit that referenced this pull request Jun 7, 2017
@mattnworb mattnworb force-pushed the mattbrown/authsupplier branch from daa3b3d to 8f294df Compare June 7, 2017 00:47
mattnworb added a commit that referenced this pull request Jun 7, 2017
mattnworb added 2 commits June 6, 2017 20:59
This largely mirrors changes done in dockerfile-maven to integrate the
new authentication support from docker-client.

The plugin now loads credentials from three places, in order:

1. Any credentials stored in ~/.dockercfg or ~/.docker/config.json

2. (Optional) Google Cloud credentials, either loaded through the
DOCKER_GOOGLE_CREDENTIALS environment variable or Google's automatic
resolution process for credentials

3. Last precedence is given to any explicitly configured credentials in
the plugin's configuration.

The `useConfigFile` parameter is no longer used as authentication info
from the docker configuration file is always activated.
Copy link
Contributor

@davidxia davidxia left a comment

Choose a reason for hiding this comment

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

if you're confident various cases work end-to-end

@mattnworb mattnworb merged commit d6d2334 into master Jun 7, 2017
@mattnworb mattnworb deleted the mattbrown/authsupplier branch June 7, 2017 19:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants