Merge branch 'master' into fix-jdbc-driver-initialization

testcontainers · Aug 15, 2016 · 4de4422 · 4de4422
2 parents 5ed5325 + 0c19d3f
commit 4de4422
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.github.docker-java</groupId>
             <artifactId>docker-java</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <exclusions>
                 <!-- replace with junixsocket -->
                 <exclusion>
@@ -189,6 +189,7 @@
                                 <exclude>META-INF/services/javax.ws.rs.ext.*</exclude>
                                 <exclude>META-INF/services/org.glassfish.hk2.extension.*</exclude>
                                 <exclude>META-INF/services/org.jvnet.hk2.external.generator.*</exclude>
+                                <exclude>META-INF/services/org.glassfish.jersey.internal.spi.*</exclude>
                             </excludes>
                         </filter>
                     </filters>

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -130,7 +130,7 @@ private void checkDiskSpaceAndHandleExceptions(DockerClient client) {
     private void checkDiskSpace(DockerClient client) {
 
         List<Image> images = client.listImagesCmd().exec();
-        if (!images.stream().anyMatch(it -> asList(it.getRepoTags()).contains("alpine:3.2"))) {
+        if (!images.stream().anyMatch(it -> it.getRepoTags() != null && asList(it.getRepoTags()).contains("alpine:3.2"))) {
             PullImageResultCallback callback = client.pullImageCmd("alpine:3.2").exec(new PullImageResultCallback());
             callback.awaitSuccess();
         }