From 102f71d2134e99e465b333f69cc310cfb7fecbab Mon Sep 17 00:00:00 2001 From: Vitalii Chura Date: Mon, 14 Sep 2020 16:40:25 +0300 Subject: [PATCH 1/2] #2769: get remote daemon url from docker-machine --- .../dockerclient/DockerMachineClientProviderStrategy.java | 6 +++--- .../org/testcontainers/utility/DockerMachineClient.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java index 2b0454c1ee6..4de508ea808 100644 --- a/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java +++ b/core/src/main/java/org/testcontainers/dockerclient/DockerMachineClientProviderStrategy.java @@ -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() diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java index fe12e9f541d..c5df65cb528 100644 --- a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java +++ b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java @@ -79,8 +79,8 @@ public void ensureMachineRunning(@NonNull String machineName) { } } - public String getDockerDaemonIpAddress(@NonNull String machineName) { - return runShellCommand(executableName, "ip", machineName); + public String getDockerDaemonUrl(@NonNull String machineName) { + return runShellCommand(executableName, "url", machineName); } public boolean isMachineRunning(String machineName) { From db3e04979e30eae161df2ed8f467807c16fe928f Mon Sep 17 00:00:00 2001 From: Vitalii Chura Date: Tue, 6 Oct 2020 14:37:21 +0300 Subject: [PATCH 2/2] #2769: make the old get ip method available again and make it deprecated --- .../org/testcontainers/utility/DockerMachineClient.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java index c5df65cb528..021baf270d9 100644 --- a/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java +++ b/core/src/main/java/org/testcontainers/utility/DockerMachineClient.java @@ -79,6 +79,14 @@ 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) { return runShellCommand(executableName, "url", machineName); }