Fix regression when using Docker Compose on Windows (#474)

Fixes #439
testcontainers · Oct 19, 2017 · 357d575 · 357d575
1 parent c42599f
commit 357d575
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,10 @@
 All notable changes to this project will be documented in this file.
 
 ## UNRELEASED
-_No changes yet_
+### Fixed
+- Fixed regression in 1.4.3 when using Docker Compose on Windows ([\#439](https://github.com/testcontainers/testcontainers-java/issues/439))
+
+### Changed
 
 ## [1.4.3] - 2017-10-14
 ### Fixed

diff --git 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<String, String> env) {
     @Override
     public void invoke() {
         // bail out early
-        if (!dockerComposeExecutableExists()) {
+        if (!CommandLine.executableExists(COMPOSE_EXECUTABLE)) {
             throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?");
         }
 
@@ -531,14 +531,6 @@ public void invoke() {
         }
     }
 
-    private boolean dockerComposeExecutableExists() {
-        if (SystemUtils.IS_OS_WINDOWS) {
-            return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe");
-        } else {
-            return CommandLine.executableExists(COMPOSE_EXECUTABLE);
-        }
-    }
-
     /**
      * @return a logger
      */