Skip to content
Permalink
Browse files

Merge pull request #140 from jglick/docker-login-env-JENKINS-51397

[JENKINS-51397] Pass environment to docker login command
  • Loading branch information...
jglick committed May 18, 2018
2 parents e8a1815 + e8873de commit a19719c196def05b740b44b75376e25dda077b84
Showing with 2 additions and 2 deletions.
  1. +1 −1 pom.xml
  2. +1 −1 src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>1.12</version>
<version>1.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -85,7 +85,7 @@ public String getToolName() {
@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));
}

}

0 comments on commit a19719c

Please sign in to comment.
You can’t perform that action at this time.