Merge pull request fabric8io#31 from spotify/dxia/use-https

Add support for HTTPS & Unix sockets
leusonmario · Nov 11, 2014 · f662a01 · f662a01
2 parents 4f88d6d + e8a96ca
commit f662a01
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 37 deletions.
diff --git a/pom.xml b/pom.xml
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.spotify</groupId>
       <artifactId>docker-client</artifactId>
-      <version>2.6.4</version>
+      <version>2.7.0</version>
     </dependency>
     <dependency>
       <groupId>com.typesafe</groupId>

diff --git a/src/main/java/com/spotify/docker/AbstractDockerMojo.java b/src/main/java/com/spotify/docker/AbstractDockerMojo.java
@@ -31,68 +31,48 @@
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.spotify.docker.client.DefaultDockerClient.NO_TIMEOUT;
 
 abstract class AbstractDockerMojo extends AbstractMojo {
 
-  private static final String DEFAULT_DOCKER_HOST = "tcp://localhost:2375";
-
   @Component(role = MavenSession.class)
   protected MavenSession session;
 
   @Component(role = MojoExecution.class)
   protected MojoExecution execution;
 
   /**
-   * URL of the docker host. Defaults to DOCKER_HOST env variable or DEFAULT_DOCKER_HOST constant.
+   * URL of the docker host as specified in pom.xml.
    */
   @Parameter(property = "dockerHost")
   private String dockerHost;
 
   public void execute() throws MojoExecutionException {
-    final DefaultDockerClient client = DefaultDockerClient.builder()
-        .uri(dockerHost())
-        .readTimeoutMillis(NO_TIMEOUT)
-        .build();
+    DockerClient client = null;
     try {
+       final DefaultDockerClient.Builder builder = DefaultDockerClient.fromEnv()
+           .readTimeoutMillis(NO_TIMEOUT);
+
+      final String dockerHost = rawDockerHost();
+      if (!isNullOrEmpty(dockerHost)) {
+        builder.uri(dockerHost);
+      }
+
+      client = builder.build();
       execute(client);
     } catch (Exception e) {
       throw new MojoExecutionException("Exception caught", e);
     } finally {
-      client.close();
+      if (client != null) {
+        client.close();
+      }
     }
   }
 
   protected abstract void execute(final DockerClient dockerClient) throws Exception;
 
-  protected String dockerHost() {
-    return normalize(rawDockerHost());
-  }
-
-  private String normalize(final String raw) {
-    final String withSchema = raw.contains("://") ? raw : "tcp://" + raw;
-    final URI uri = URI.create(withSchema);
-    final URI normalized;
-    try {
-      normalized = new URI("http", uri.getUserInfo(), uri.getHost(), uri.getPort(), uri.getPath(),
-                           uri.getQuery(), uri.getFragment());
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
-    }
-    return normalized.toString();
-  }
-
   protected String rawDockerHost() {
-    if (dockerHost != null) {
-      return dockerHost;
-    }
-    final String dockerHostEnv = System.getenv("DOCKER_HOST");
-    if (dockerHostEnv != null) {
-      return dockerHostEnv;
-    }
-    return DEFAULT_DOCKER_HOST;
+    return dockerHost;
   }
 }