From 7158c7b8e59f8e3725f54e25917b45756d85adf3 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Fri, 20 Jan 2017 23:30:51 +0200 Subject: [PATCH] fix for Docker for Mac with 1.13 --- .../main/java/org/testcontainers/utility/TestEnvironment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/testcontainers/utility/TestEnvironment.java b/core/src/main/java/org/testcontainers/utility/TestEnvironment.java index 3e858c35f3b..dbd8e45a98f 100644 --- 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() {