Skip to content

Commit 357d575

Browse files
barrycomminskiview
authored andcommitted
Fix regression when using Docker Compose on Windows (#474)
Fixes #439
1 parent c42599f commit 357d575

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
All notable changes to this project will be documented in this file.
33

44
## UNRELEASED
5-
_No changes yet_
5+
### Fixed
6+
- Fixed regression in 1.4.3 when using Docker Compose on Windows ([\#439](https://github.com/testcontainers/testcontainers-java/issues/439))
7+
8+
### Changed
69

710
## [1.4.3] - 2017-10-14
811
### Fixed

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public DockerCompose withEnv(Map<String, String> env) {
494494
@Override
495495
public void invoke() {
496496
// bail out early
497-
if (!dockerComposeExecutableExists()) {
497+
if (!CommandLine.executableExists(COMPOSE_EXECUTABLE)) {
498498
throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?");
499499
}
500500

@@ -531,14 +531,6 @@ public void invoke() {
531531
}
532532
}
533533

534-
private boolean dockerComposeExecutableExists() {
535-
if (SystemUtils.IS_OS_WINDOWS) {
536-
return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe");
537-
} else {
538-
return CommandLine.executableExists(COMPOSE_EXECUTABLE);
539-
}
540-
}
541-
542534
/**
543535
* @return a logger
544536
*/

0 commit comments

Comments
 (0)