diff options
| -rw-r--r-- | docker-api/src/main/resources/configdefinitions/docker.def | 8 | ||||
| -rw-r--r-- | node-admin/src/main/application/services.xml | 4 |
2 files changed, 1 insertions, 11 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 diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml index d4fd7a11f20..f1cfeb69660 100644 --- a/node-admin/src/main/application/services.xml +++ b/node-admin/src/main/application/services.xml @@ -7,10 +7,6 @@ <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/> <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/> - <config name="vespa.hosted.dockerapi.docker"> - <uri>unix:///var/run/docker.sock</uri> - </config> - <preprocess:include file="variant.xml" required="false"/> </container> </services> |