Skip to content
Permalink
Browse files
[FIXED JENKINS-23200] Upgrade to the lates docker-java
To cover latest Docker 1.11 REST API
  • Loading branch information
vjuranek committed May 28, 2014
1 parent e7c792b commit 34080f9912cd94dc69903d1f24257eb336c84f09
Showing 2 changed files with 11 additions and 3 deletions.
@@ -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>
@@ -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);
}

0 comments on commit 34080f9

Please sign in to comment.