diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-02-15 21:19:38 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-02-15 21:19:38 +0100 |
| commit | 92f499bd92a80fe370f25de3d327c6ef6dbff8bb (patch) | |
| tree | d5323d663ab853bd2c4bb4d2054ff0e4e7527bc3 /docker-api | |
| parent | 060fc9b48c377e7f2eafd3c531c62a8e0894324f (diff) | |
Remove withReadTimeout and docker.def
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 8 | ||||
| -rw-r--r-- | docker-api/src/main/resources/configdefinitions/docker.def | 9 |
3 files changed, 4 insertions, 15 deletions
diff --git a/docker-api/CMakeLists.txt b/docker-api/CMakeLists.txt deleted file mode 100644 index 25957c81e4c..00000000000 --- a/docker-api/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_config_definition(src/main/resources/configdefinitions/docker.def vespa.hosted.dockerapi.docker.def) diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 6640c980f76..d541b7ec65f 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -392,12 +392,12 @@ public class DockerImpl implements Docker { private static DockerClient createDockerClient(DockerConfig config) { JerseyDockerCmdExecFactory dockerFactory = new JerseyDockerCmdExecFactory() - .withMaxPerRouteConnections(config.maxPerRouteConnections()) - .withMaxTotalConnections(config.maxTotalConnections()) - .withConnectTimeout(config.connectTimeoutMillis()); + .withMaxPerRouteConnections(10) + .withMaxTotalConnections(100) + .withConnectTimeout((int) Duration.ofSeconds(100).toMillis()); DockerClientConfig dockerClientConfig = new DefaultDockerClientConfig.Builder() - .withDockerHost(config.uri()) + .withDockerHost("unix:///var/run/docker.sock") .build(); return DockerClientImpl.getInstance(dockerClientConfig) diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def deleted file mode 100644 index 5bc40da135f..00000000000 --- a/docker-api/src/main/resources/configdefinitions/docker.def +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=vespa.hosted.dockerapi - -uri string default = "unix:///var/run/docker.sock" - -maxPerRouteConnections int default = 10 -maxTotalConnections int default = 100 -connectTimeoutMillis int default = 100000 # 100 sec -readTimeoutMillis int default = 1800000 # 30 min |