Merge pull request #272 from testcontainers/docker4mac_1_13_fix

fix for Docker for Mac with 1.13
testcontainers · Jan 21, 2017 · 638e4d0 · 638e4d0
2 parents 398c6b6 + 7158c7b
commit 638e4d0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/testcontainers/utility/TestEnvironment.java b/core/src/main/java/org/testcontainers/utility/TestEnvironment.java
@@ -21,7 +21,8 @@ public static boolean dockerApiAtLeast(String minimumVersion) {
     public static boolean dockerExecutionDriverSupportsExec() {
         String executionDriver = DockerClientFactory.instance().getActiveExecutionDriver();
 
-        return !executionDriver.startsWith("lxc");
+        // Could be null starting from Docker 1.13
+        return executionDriver == null || !executionDriver.startsWith("lxc");
     }
 
     public static boolean dockerIsDockerMachine() {