Merge pull request #72 from jglick/registry-diag-JENKINS-38018

[JENKINS-38018] Call newly available API
jenkinsci · Oct 5, 2016 · 0d391ed · 0d391ed
2 parents 77241fc + e3ef354
commit 0d391ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>docker-commons</artifactId>
-            <version>1.3.1</version>
+            <version>1.5-SNAPSHOT</version> <!-- https://github.com/jenkinsci/docker-commons-plugin/pull/55 -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java
@@ -26,7 +26,9 @@
 import com.google.inject.Inject;
 import hudson.Extension;
 import hudson.FilePath;
+import hudson.Launcher;
 import hudson.model.Job;
+import hudson.model.TaskListener;
 import java.io.IOException;
 import javax.annotation.Nonnull;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
@@ -56,9 +58,11 @@ public static class Execution extends AbstractEndpointStepExecution {
         @Inject(optional=true) private transient RegistryEndpointStep step;
         @StepContextParameter private transient Job<?,?> job;
         @StepContextParameter private transient FilePath workspace;
+        @StepContextParameter private transient Launcher launcher;
+        @StepContextParameter private transient TaskListener listener;
 
         @Override protected KeyMaterialFactory newKeyMaterialFactory() throws IOException, InterruptedException {
-            return step.registry.newKeyMaterialFactory(job, workspace.getChannel());
+            return step.registry.newKeyMaterialFactory(job, workspace.getChannel(), launcher, listener);
         }
 
     }