From ac27dce829d38c95671962148116c0e611c43fe1 Mon Sep 17 00:00:00 2001 From: Alan Bevier Date: Fri, 20 Oct 2017 14:34:58 -0400 Subject: [PATCH] Add default exe locations for Windows --- .../docker/compose/execution/DockerComposeExecutable.java | 3 ++- .../palantir/docker/compose/execution/DockerExecutable.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java index 9c2daed21..a0e250b6b 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java @@ -32,7 +32,8 @@ public abstract class DockerComposeExecutable implements Executable { private static final DockerCommandLocations DOCKER_COMPOSE_LOCATIONS = new DockerCommandLocations( System.getenv("DOCKER_COMPOSE_LOCATION"), "/usr/local/bin/docker-compose", - "/usr/bin/docker-compose" + "/usr/bin/docker-compose", + "C:/program files/docker/docker/resources/bin/docker-compose.exe" ); private static String defaultDockerComposePath() { diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java index 1ff5cf01e..d3004e036 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java @@ -29,7 +29,8 @@ public abstract class DockerExecutable implements Executable { private static final DockerCommandLocations DOCKER_LOCATIONS = new DockerCommandLocations( System.getenv("DOCKER_LOCATION"), "/usr/local/bin/docker", - "/usr/bin/docker" + "/usr/bin/docker", + "C:/program files/docker/docker/resources/bin/docker.exe" ); @Value.Parameter protected abstract DockerConfiguration dockerConfiguration();