Merge pull request #51 from mwl/refactor/sans-proxies

Removing proxies

src/main/java/org/apache/mesos/mini/MesosCluster.java

@@ -7,7 +7,6 @@
 import com.mashape.unirest.http.exceptions.UnirestException;
 import org.apache.log4j.Logger;
 import org.apache.mesos.mini.container.AbstractContainer;
-import org.apache.mesos.mini.docker.DockerProxy;
 import org.apache.mesos.mini.docker.ImagePusher;
 import org.apache.mesos.mini.docker.PrivateDockerRegistry;
 import org.apache.mesos.mini.mesos.MesosClusterConfig;
@@ -55,16 +54,6 @@ public void start() {
         LOGGER.info("Starting Mesos cluster");
 
         try {
-            String os = System.getProperty("os.name");
-            if (!os.equals("Linux")) {
-                LOGGER.info("Mini-Mesos runs on '" + os + "'. Starting HTTP Proxy for container networking");
-                DockerProxy dockerProxy = new DockerProxy(config.dockerClient, config.proxyPort);
-                addAndStartContainer(dockerProxy);
-                LOGGER.info("Started Proxy at " + dockerProxy.getIpAddress() + ":" + config.proxyPort);
-            } else {
-                LOGGER.info("Mini-Mesos runs on 'Linux'. No need to run HTTP Proxy for container networking");
-            }
-
             LOGGER.info("Starting Registry");
             PrivateDockerRegistry privateDockerRegistry = new PrivateDockerRegistry(config.dockerClient, this.config);
             addAndStartContainer(privateDockerRegistry);

src/main/java/org/apache/mesos/mini/mesos/MesosClusterConfig.java

@@ -86,11 +86,6 @@ public Builder defaultDockerClient() {
 
             DockerClientConfig config = builder.build();
 
-            if (config.getUri().getScheme().startsWith("http") && !System.getProperty("os.name").equals("Linux")) {
-                HttpHost proxy = new HttpHost(config.getUri().getHost(), this.proxyPort);
-                Unirest.setProxy(proxy);
-                Unirest.setTimeouts(20_000L, 20_000L);
-            }
             this.dockerClient = DockerClientBuilder.getInstance(config).build();
             return this;
         }

src/main/java/org/apache/mesos/mini/mesos/MesosContainer.java

@@ -30,7 +30,6 @@ public class MesosContainer extends AbstractContainer {
     private final MesosClusterConfig clusterConfig;
     private final String registryContainerId;
     private DockerClient innerDockerClient;
-    private InnerDockerProxy innerDockerProxy;
 
     public MesosContainer(DockerClient dockerClient, MesosClusterConfig clusterConfig, String registryContainerId) {
         super(dockerClient);
@@ -46,16 +45,8 @@ public void start() {
 
         String os = System.getProperty("os.name");
         DockerClientConfig.DockerClientConfigBuilder innerDockerConfigBuilder;
-        if (!os.equals("Linux")) {
-            LOGGER.info("Mini-Mesos runs on '" + os + "'. Starting inner Docker Proxy");
-            innerDockerProxy = new InnerDockerProxy(clusterConfig.dockerClient, this);
-            innerDockerProxy.start();
-            innerDockerConfigBuilder = DockerClientConfig.createDefaultConfigBuilder();
-            innerDockerConfigBuilder.withUri("http://" + innerDockerConfigBuilder.build().getUri().getHost() + ":" + innerDockerProxy.getProxyPort());
-        } else {
-            innerDockerConfigBuilder = DockerClientConfig.createDefaultConfigBuilder();
-            innerDockerConfigBuilder.withUri("http://" + getIpAddress() + ":" + getDockerPort());
-        }
+        innerDockerConfigBuilder = DockerClientConfig.createDefaultConfigBuilder();
+        innerDockerConfigBuilder.withUri("http://" + getIpAddress() + ":" + getDockerPort());
         this.innerDockerClient = DockerClientBuilder.getInstance(innerDockerConfigBuilder.build()).build();
     }
 
@@ -114,10 +105,6 @@ public void remove() {
             innerDockerClient.removeContainerCmd(innerContainer.getId()).withForce().withRemoveVolumes(true).exec();
         }
 
-        if (innerDockerProxy != null) {
-            innerDockerProxy.remove();
-        }
-
         LOGGER.info("Removing Mesos-Local container");
         super.remove();
     }