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.

Sign up for GitHub

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

Jump to bottom

[JENKINS-51397] Pass environment to docker login command #140

Merged
merged 2 commits into from May 18, 2018
Merged

[JENKINS-51397] Pass environment to docker login command #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2319da7
[JENKINS-51397] Pass environment to docker login command.
jglick May 17, 2018
e8873de
docker-commons 1.13
jglick May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>1.12</version>
<version>1.13-rc157.4f7f7772d36c</version> <!-- TODO https://github.com/jenkinsci/docker-commons-plugin/pull/71 -->
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ public static class Execution extends AbstractEndpointStepExecution {
@StepContextParameter private transient EnvVars envVars;

@Override protected KeyMaterialFactory newKeyMaterialFactory() throws IOException, InterruptedException {
return step.registry.newKeyMaterialFactory(job, workspace, launcher, listener, DockerTool.getExecutable(step.toolName, node, listener, envVars));
return step.registry.newKeyMaterialFactory(job, workspace, launcher, envVars, listener, DockerTool.getExecutable(step.toolName, node, listener, envVars));
}

}
Expand Down