[FIXED JENKINS-23200] Upgrade to the lates docker-java

To cover latest Docker 1.11 REST API
jenkinsci · May 28, 2014 · 34080f9 · 34080f9
1 parent e7c792b
commit 34080f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
   </scm>
 
 	<properties>
-		<version.docker.java>0.8.1</version.docker.java>
+		<version.docker.java>0.8.2-SNAPSHOT</version.docker.java>
 	</properties>
 
 	<dependencies>

diff --git a/src/main/java/org/jenkinsci/plugins/dockerbuildstep/DockerBuilder.java b/src/main/java/org/jenkinsci/plugins/dockerbuildstep/DockerBuilder.java
@@ -77,7 +77,11 @@ public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
 
         public DescriptorImpl() {
             load();
-            dockerClient = new DockerClient(dockerUrl);
+            try {
+                dockerClient = new DockerClient(dockerUrl);
+            } catch(DockerException e) {
+                LOGGER.warning("Cannot create Docker client: " + e.getCause());
+            }
         }
 
         public FormValidation doCheckName(@QueryParameter String dockerURL) throws IOException, ServletException {
@@ -97,7 +101,11 @@ public String getDisplayName() {
         public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
             dockerUrl = formData.getString("dockerUrl");
             save();
-            dockerClient = new DockerClient(dockerUrl);
+            try {
+                dockerClient = new DockerClient(dockerUrl);
+            } catch(DockerException e) {
+                LOGGER.warning("Cannot create Docker client: " + e.getCause());
+            }
             return super.configure(req, formData);
         }