summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-09-20 14:03:36 +0200
committerValerij Fredriksen <valerijf@oath.com>2018-09-20 14:03:36 +0200
commitde17850fb3d36e93495cbe27f8979e23c179474e (patch)
tree96bf96919908b5779f790bacbefb1a36fbbef8e6 /docker-api
parent45c0cb758568357fd5e42fcbd74529c7be90c8b3 (diff)
Add todo
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/resources/configdefinitions/docker.def4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def
index 83fee05dff6..3d594e5d62b 100644
--- a/docker-api/src/main/resources/configdefinitions/docker.def
+++ b/docker-api/src/main/resources/configdefinitions/docker.def
@@ -3,13 +3,13 @@ namespace=vespa.hosted.dockerapi
uri string default = "unix:///host/var/run/docker.sock"
-secondsToWaitBeforeKillingContainer int default = 10
maxPerRouteConnections int default = 10
maxTotalConnections int default = 100
connectTimeoutMillis int default = 100000 # 100 sec
readTimeoutMillis int default = 1800000 # 30 min
+# TODO: Remove
+secondsToWaitBeforeKillingContainer int default = 10
isRunningLocally bool default = false
imageGCMinTimeToLiveMinutes int default = 45
-
networkNATed bool default = false