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

Added Windows default paths for docker.exe and docker-compose.exe #318

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added Windows default paths for docker.exe and docker-compose.exe #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39738fe
Added Windows default paths for docker.exe and docker-compose.exe
tifoha Aug 7, 2019
494c834
Merge branch 'master' into windows-default-paths-support
tifoha Sep 4, 2019
926c349
Added Windows default paths for docker.exe and docker-compose.exe
tifoha Sep 4, 2019
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
4 changes: 2 additions & 2 deletions docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@

package com.palantir.docker.compose;

import com.google.common.collect.Sets;
import com.palantir.docker.compose.connection.Cluster;
import com.palantir.docker.compose.connection.Container;
import com.palantir.docker.compose.connection.ContainerCache;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

final class RecordingCluster extends Cluster {
private final Cluster delegate;
private final Set<String> recordedContainerNames = Sets.newConcurrentHashSet();
private final Set<String> recordedContainerNames = ConcurrentHashMap.newKeySet();

RecordingCluster(Cluster delegate) {
this.delegate = delegate;
Expand Down
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",
"/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",
"/Program Files/Docker/Docker/resources/bin/docker.exe"
);

@Value.Parameter protected abstract DockerConfiguration dockerConfiguration();
Expand Down