Updated the docker-junit-rule.

Author: Tomek Rękawek

pom.xml

@@ -119,7 +119,7 @@
     <dependency>
       <groupId>com.arakelian</groupId>
       <artifactId>docker-junit-rule</artifactId>
-      <version>2.1.4</version>
+      <version>4.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/eu/rekawek/toxiproxy/ToxiproxyRule.java

@@ -2,45 +2,44 @@
 
 import com.arakelian.docker.junit.DockerRule;
 import com.arakelian.docker.junit.model.ImmutableDockerConfig;
-import com.spotify.docker.client.DefaultDockerClient;
 import org.junit.Assume;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
+import repackaged.com.arakelian.docker.junit.com.github.dockerjava.api.model.ExposedPort;
+import repackaged.com.arakelian.docker.junit.com.github.dockerjava.api.model.PortBinding;
+import repackaged.com.arakelian.docker.junit.com.github.dockerjava.core.DockerClientImpl;
+import repackaged.com.arakelian.docker.junit.com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory;
 
 public class ToxiproxyRule implements TestRule {
 
     private final DockerRule wrappedRule;
 
     public ToxiproxyRule() {
         wrappedRule = new DockerRule(ImmutableDockerConfig.builder()
-                .image("shopify/toxiproxy:2.1.3")
-                .name("text-toxiproxy")
-                .ports("8474")
+                .image("shopify/toxiproxy:2.1.4")
                 .addStartedListener(container -> {
-                    container.waitForPort("8474/tcp");
+                    container.waitForPort(ExposedPort.tcp(8474));
+                })
+                .addHostConfigConfigurer(hostConfig -> {
+                    hostConfig.withPortBindings(PortBinding.parse("8474"));
                 })
-                .alwaysRemoveContainer(true)
                 .build());
-
     }
 
     public ToxiproxyClient getToxiproxyClient() {
-        int mappedPort = wrappedRule.getContainer().getPortBinding("8474/tcp").getPort();
+        int mappedPort = wrappedRule.getContainer().getSimpleBinding(ExposedPort.tcp(8474)).getPort();
         ToxiproxyClient tp = new ToxiproxyClient("localhost", mappedPort);
         return tp;
     }
 
     @Override
     public Statement apply(Statement statement, Description description) {
         try {
-            DefaultDockerClient client = DefaultDockerClient.fromEnv().connectTimeoutMillis(5000L).readTimeoutMillis(20000L).build();
-            client.ping();
-            client.close();
+            DockerClientImpl.getInstance().withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory()).pingCmd().exec();
         } catch (Exception e) {
             Assume.assumeNoException(e);
         }
-
         return wrappedRule.apply(statement, description);
     }
 }