Skip to content

Commit 1113cd4

Browse files
authored
Rely on TransportConfig to read DOCKER_HOST env variable for DockerComposeContainer (#5276)
`TransportConfig` is already aware of `DOCKER_HOST`.
1 parent 66e4be2 commit 1113cd4

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -726,20 +726,17 @@ public void invoke() {
726726
final Map<String, String> environment = Maps.newHashMap(env);
727727
environment.put(ENV_PROJECT_NAME, identifier);
728728

729-
String dockerHost = System.getenv("DOCKER_HOST");
730-
if (dockerHost == null) {
731-
TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
732-
SSLConfig sslConfig = transportConfig.getSslConfig();
733-
if (sslConfig != null) {
734-
if (sslConfig instanceof LocalDirectorySSLConfig) {
735-
environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
736-
environment.put("DOCKER_TLS_VERIFY", "true");
737-
} else {
738-
logger().warn("Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig.");
739-
}
729+
TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
730+
SSLConfig sslConfig = transportConfig.getSslConfig();
731+
if (sslConfig != null) {
732+
if (sslConfig instanceof LocalDirectorySSLConfig) {
733+
environment.put("DOCKER_CERT_PATH", ((LocalDirectorySSLConfig) sslConfig).getDockerCertPath());
734+
environment.put("DOCKER_TLS_VERIFY", "true");
735+
} else {
736+
logger().warn("Couldn't set DOCKER_CERT_PATH. `sslConfig` is present but it's not LocalDirectorySSLConfig.");
740737
}
741-
dockerHost = transportConfig.getDockerHost().toString();
742738
}
739+
String dockerHost = transportConfig.getDockerHost().toString();
743740
environment.put("DOCKER_HOST", dockerHost);
744741

745742
final Stream<String> absoluteDockerComposeFilePaths = composeFiles.stream()

0 commit comments

Comments
 (0)