From 1d0ff13b6294da9f7758ad98ff4b6fd9ec26f3c9 Mon Sep 17 00:00:00 2001 From: Liosha Date: Mon, 11 May 2026 16:24:47 +0300 Subject: [PATCH] adjast wss + docker logs --- .../jambotron/dockerClient/DockerConfig.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jambotronGroup/jambotron/dockerClient/DockerConfig.java b/src/main/java/com/jambotronGroup/jambotron/dockerClient/DockerConfig.java index e7c55aa..095ff07 100644 --- a/src/main/java/com/jambotronGroup/jambotron/dockerClient/DockerConfig.java +++ b/src/main/java/com/jambotronGroup/jambotron/dockerClient/DockerConfig.java @@ -23,8 +23,15 @@ public class DockerConfig { @Bean public DockerClient dockerClient() { + + // Если переменная подтянулась криво, возвращаем её к сокету + String hostToUse = dockerHost; + if (hostToUse.contains("2375")) { + hostToUse = "unix:///var/run/docker.sock"; + } + DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withDockerHost(dockerHost) + .withDockerHost(hostToUse) .build(); DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder() @@ -32,8 +39,8 @@ public class DockerConfig { .sslConfig(config.getSSLConfig()) .maxConnections(100) .build(); - _logger.info("DOCKER_HOST:{}",config.getDockerHost()); + _logger.info("Final Docker Host used: {}", config.getDockerHost()); return DockerClientImpl.getInstance(config, httpClient); } } \ No newline at end of file