Skip to content

Commit

Permalink
Fix docker-compose executable check: renaming regarding review commen…
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdan committed Sep 21, 2017
1 parent 61d9b0e commit df95e7b
Showing 1 changed file with 2 additions and 4 deletions.
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 (!isDockerComposeExists()) {
if (!dockerComposeExecutableExists()) {
throw new ContainerLaunchException("Local Docker Compose not found. Is " + COMPOSE_EXECUTABLE + " on the PATH?");
}

Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit df95e7b

Please sign in to comment.