summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-10-04 09:30:52 +0200
committerValerij Fredriksen <valerijf@oath.com>2018-10-04 09:30:52 +0200
commitbce476792769b04f225663a6fcbc28514033d25c (patch)
tree038d5fddb9c2b73390e4e9117cec853104eb9beb /docker-api
parent34ba19e18306f2432c61d4bcaa3a296dd38c7d7b (diff)
Remove unused config options
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/resources/configdefinitions/docker.def8
1 files changed, 1 insertions, 7 deletions
diff --git a/docker-api/src/main/resources/configdefinitions/docker.def b/docker-api/src/main/resources/configdefinitions/docker.def
index 3d594e5d62b..5bc40da135f 100644
--- a/docker-api/src/main/resources/configdefinitions/docker.def
+++ b/docker-api/src/main/resources/configdefinitions/docker.def
@@ -1,15 +1,9 @@
# 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:///host/var/run/docker.sock"
+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
-
-# TODO: Remove
-secondsToWaitBeforeKillingContainer int default = 10
-isRunningLocally bool default = false
-imageGCMinTimeToLiveMinutes int default = 45
-networkNATed bool default = false