Skip to content

docker-machine: get full remote daemon URL, to allow for use of custom daemon port (#2769) #3237

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

Merged
rnorth merged 2 commits into from
Oct 14, 2020
Merged

docker-machine: get full remote daemon URL, to allow for use of custom daemon port (#2769) #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
102f71d
#2769: get remote daemon url from docker-machine
Sep 14, 2020
db3e049
#2769: make the old get ip method available again and make it deprecated
Oct 6, 2020
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
6 changes: 3 additions & 3 deletions core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ private TransportConfig resolveTransportConfig() throws InvalidConfigurationExce

DockerMachineClient.instance().ensureMachineRunning(machineName);

String dockerDaemonIpAddress = DockerMachineClient.instance().getDockerDaemonIpAddress(machineName);
String dockerDaemonUrl = DockerMachineClient.instance().getDockerDaemonUrl(machineName);

log.info("Docker daemon IP address for docker machine {} is {}", machineName, dockerDaemonIpAddress);
log.info("Docker daemon URL for docker machine {} is {}", machineName, dockerDaemonUrl);

return TransportConfig.builder()
.dockerHost(URI.create("tcp://" + dockerDaemonIpAddress + ":2376"))
.dockerHost(URI.create(dockerDaemonUrl))
.sslConfig(
new LocalDirectorySSLConfig(
Paths.get(System.getProperty("user.home") + "/.docker/machine/certs/").toString()
Expand Down
8 changes: 8 additions & 0 deletions core/src/main/java/org/testcontainers/utility/DockerMachineClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,18 @@ public void ensureMachineRunning(@NonNull String machineName) {
}
}

/**
* @deprecated Use getDockerDaemonUrl(@NonNull String machineName) for connection to docker-machine
*/
@Deprecated
public String getDockerDaemonIpAddress(@NonNull String machineName) {
return runShellCommand(executableName, "ip", machineName);
}

public String getDockerDaemonUrl(@NonNull String machineName) {
Copy link
Copy Markdown
Member

@bsideup bsideup Sep 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this is a public class, please make sure that the old method is available (and make it @Deprecated)

Copy link
Copy Markdown
Contributor Author

@vcvitaly vcvitaly Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

return runShellCommand(executableName, "url", machineName);
}

public boolean isMachineRunning(String machineName) {
String status = runShellCommand("docker-machine", "status", machineName);
return status.trim().equalsIgnoreCase("running");
Expand Down