Skip to content

Commit

Permalink
Setting platform dependent docker-compose executable name (#437)
Browse files Browse the repository at this point in the history
* Setting platform dependent docker-compose executable name

Fixes #416

* Changed docker-compose executable naming to be more concise

* Reverted Compose executable variable name, added change to CHANGELOG.md
  • Loading branch information
barrycommins authored and bsideup committed Aug 11, 2017
1 parent 32b6551 commit 1a04781
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Change Log
All notable changes to this project will be documented in this file.

## UNRELEASED
### Fixed
- Fixed local Docker Compose executable name resolution on Windows (#416)

### Changed

## [1.4.2] - 2017-07-25
### Fixed
- Worked around incompatibility between Netty's Unix socket support and OS X 10.11. Reinstated use of TCP-Unix Socket proxy when running on OS X prior to v10.12. (Fixes #402)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.SystemUtils;
import org.junit.runner.Description;
import org.rnorth.ducttape.ratelimits.RateLimiter;
import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
Expand Down Expand Up @@ -464,7 +465,7 @@ class LocalDockerCompose implements DockerCompose {
/**
* Executable name for Docker Compose.
*/
private static final String COMPOSE_EXECUTABLE = "docker-compose";
private static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";

private final List<File> composeFiles;
private final String identifier;
Expand Down

0 comments on commit 1a04781

Please sign in to comment.