Skip to content
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

Add default exe locations for Windows #215

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add default exe locations for Windows #215

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
3 changes: 2 additions & 1 deletion ...ule-core/src/main/java/com/palantir/docker/compose/execution/DockerComposeExecutable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 2 additions & 1 deletion ...mpose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerExecutable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down