Skip to content

Fixed regression in 1.4.3 when using Docker Compose on Windows, Fixes #439 #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiview merged 1 commit into from
Oct 19, 2017
Merged

Fixed regression in 1.4.3 when using Docker Compose on Windows, Fixes #439 #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?");
}

Expand Down Expand Up @@ -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
*/
Expand Down