Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-38018] Extend DockerRegistryEndpoint API to take a Launcher and TaskListener #55

Merged
merged 1 commit into from Oct 5, 2016

Conversation

Projects
None yet
5 participants
@jglick
Copy link
Member

commented Oct 3, 2016


return token.newKeyMaterialFactory(getEffectiveUrl(), target);
if (token == null) {
throw new AbortException("Could not find credentials matching " + credentialsId);

This comment has been minimized.

Copy link
@jglick

jglick Oct 3, 2016

Author Member

Previously it would silently succeed, allowing subsequent attempts to use the registry to fail mysteriously.

* Makes the credentials available locally and returns {@link KeyMaterialFactory} that gives you the parameters
* needed to access it.
*
* This is done by inserting the token into {@code ~/.dockercfg}
*/
public KeyMaterialFactory newKeyMaterialFactory(final URL endpoint, @Nonnull VirtualChannel target) throws InterruptedException, IOException {
public KeyMaterialFactory newKeyMaterialFactory(final @Nonnull URL endpoint, @Nonnull VirtualChannel target, @CheckForNull Launcher launcher, final @Nonnull TaskListener listener) throws InterruptedException, IOException {

This comment has been minimized.

Copy link
@jglick

jglick Oct 3, 2016

Author Member

Not currently using the launcher, but left as an option should we wish to call docker login—though a close implementation (JENKINS-28702) could not run docker logout using a Launcher for serialization reasons, unless the KeyMaterial API were also modified to accept a Launcher and TaskListener.

@oleg-nenashev
Copy link
Member

left a comment

🐝

@@ -5,12 +5,12 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.14</version>
<relativePath />
<version>2.15</version>

This comment has been minimized.

Copy link
@oleg-nenashev

This comment has been minimized.

Copy link
@jglick

jglick Oct 3, 2016

Author Member

Did not see that in my local index yet. Anyway works fine with 2.15 for now.

@jglick

This comment has been minimized.

Copy link
Member Author

commented Oct 4, 2016

Thanks for the review, but it is useless without a review of the downstream PR…

@reviewbybees

This comment has been minimized.

Copy link

commented Oct 4, 2016

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@stephenc

This comment has been minimized.

Copy link
Member

commented Oct 5, 2016

🐝 AIUI

@stephenc

This comment has been minimized.

Copy link
Member

commented Oct 5, 2016

@reviewbybees

This comment has been minimized.

Copy link

commented Oct 5, 2016

This pull request has completed our internal processes and we now respectfully request the maintainers of this repository to consider our proposal contained within this pull request for merging.

@jglick jglick merged commit fb0aa29 into jenkinsci:master Oct 5, 2016

1 check passed

Jenkins This pull request looks good
Details

@jglick jglick deleted the jglick:registry-diag-JENKINS-38018 branch Oct 5, 2016

</parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>1.4.2-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>

This comment has been minimized.

Copy link
@KostyaSha

KostyaSha Oct 5, 2016

Member

Changing master versions with additional features is bad for visibility

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.