From df95e7b384c711026363e91036a41e2971b9a80d Mon Sep 17 00:00:00 2001 From: bogdan Date: Thu, 21 Sep 2017 15:31:26 +0300 Subject: [PATCH] Fix docker-compose executable check: renaming regarding review comments (#460) --- .../testcontainers/containers/DockerComposeContainer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java index a84206b4556..4d06d1018de 100644 --- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java +++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java @@ -494,7 +494,7 @@ public DockerCompose withEnv(Map env) { @Override public void invoke() { // bail out early - if (!isDockerComposeExists()) { + if (!dockerComposeExecutableExists()) { throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?"); } @@ -531,9 +531,7 @@ public void invoke() { } } - // #460 : docker-compose are not resolvable on Win10 machines because there is docker-compose.exe binary, - // but not docker-compose - private boolean isDockerComposeExists() { + private boolean dockerComposeExecutableExists() { boolean dockerComposeExists = CommandLine.executableExists(COMPOSE_EXECUTABLE); if (!dockerComposeExists && SystemUtils.IS_OS_WINDOWS) { return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe");