adjast wss + docker logs
This commit is contained in:
@@ -17,6 +17,7 @@ public class DockerLogService {
|
|||||||
public DockerLogService(SimpMessagingTemplate messagingTemplate, DockerClient dockerClient) {
|
public DockerLogService(SimpMessagingTemplate messagingTemplate, DockerClient dockerClient) {
|
||||||
this.messagingTemplate = messagingTemplate;
|
this.messagingTemplate = messagingTemplate;
|
||||||
this.dockerClient = dockerClient;
|
this.dockerClient = dockerClient;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Async
|
@Async
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import com.github.dockerjava.core.DockerClientConfig;
|
|||||||
import com.github.dockerjava.core.DockerClientImpl;
|
import com.github.dockerjava.core.DockerClientImpl;
|
||||||
import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
|
import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
|
||||||
import com.github.dockerjava.transport.DockerHttpClient;
|
import com.github.dockerjava.transport.DockerHttpClient;
|
||||||
|
import com.jambotronGroup.jambotron.controllers.FileBrowserTreeController;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
@@ -13,6 +16,8 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
@Configuration
|
@Configuration
|
||||||
public class DockerConfig {
|
public class DockerConfig {
|
||||||
|
|
||||||
|
private final Logger _logger = LoggerFactory.getLogger(DockerConfig.class);
|
||||||
|
|
||||||
@Value("${DOCKER_HOST:${docker.host:unix:///var/run/docker.sock}}")
|
@Value("${DOCKER_HOST:${docker.host:unix:///var/run/docker.sock}}")
|
||||||
private String dockerHost;
|
private String dockerHost;
|
||||||
|
|
||||||
@@ -27,7 +32,7 @@ public class DockerConfig {
|
|||||||
.sslConfig(config.getSSLConfig())
|
.sslConfig(config.getSSLConfig())
|
||||||
.maxConnections(100)
|
.maxConnections(100)
|
||||||
.build();
|
.build();
|
||||||
|
_logger.info("DOCKER_HOST:{}",config.getDockerHost());
|
||||||
return DockerClientImpl.getInstance(config, httpClient);
|
return DockerClientImpl.getInstance(config, httpClient);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user