diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java index 989aaf36be3..81d54990680 100644 --- a/core/src/main/java/org/testcontainers/DockerClientFactory.java +++ b/core/src/main/java/org/testcontainers/DockerClientFactory.java @@ -24,11 +24,9 @@ import org.testcontainers.dockerclient.TransportConfig; import org.testcontainers.images.RemoteDockerImage; import org.testcontainers.images.TimeLimitedLoggedPullImageResultCallback; -import org.testcontainers.utility.ComparableVersion; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; import org.testcontainers.utility.ResourceReaper; -import org.testcontainers.utility.TestcontainersConfiguration; import java.io.InputStream; import java.net.URI; @@ -248,39 +246,9 @@ public void close() { throw e; } - boolean checksEnabled = !TestcontainersConfiguration.getInstance().isDisableChecks(); - if (checksEnabled) { - log.debug("Checks are enabled"); - - try { - log.info("Checking the system..."); - checkDockerVersion(version.getVersion()); - } catch (RuntimeException e) { - cachedClientFailure = e; - throw e; - } - } else { - log.debug("Checks are disabled"); - } - return client; } - private void checkDockerVersion(String dockerVersion) { - boolean versionIsSufficient = new ComparableVersion(dockerVersion).compareTo(new ComparableVersion("1.6.0")) >= - 0; - check("Docker server version should be at least 1.6.0", versionIsSufficient); - } - - private void check(String message, boolean isSuccessful) { - if (isSuccessful) { - log.info("\u2714\ufe0e {}", message); - } else { - log.error("\u274c {}", message); - throw new IllegalStateException("Check failed: " + message); - } - } - private boolean checkMountableFile() { DockerClient dockerClient = client(); diff --git a/docs/features/configuration.md b/docs/features/configuration.md index 389936cb89f..0b6822d7f71 100644 --- a/docs/features/configuration.md +++ b/docs/features/configuration.md @@ -29,7 +29,6 @@ If any keys conflict, the value will be taken on the basis of the first value fo Before running any containers Testcontainers will perform a set of startup checks to ensure that your environment is configured correctly. Usually they look like this: ``` ℹ︎ Checking the system... - ✔ Docker version should be at least 1.6.0 ✔ File should be mountable ✔ A port exposed by a docker container should be accessible ```