summaryrefslogtreecommitdiffstats
path: root/configdefinitions
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-12-05 13:07:17 +0100
committerHarald Musum <musum@yahoo-inc.com>2016-12-05 13:07:17 +0100
commitd6050d78ac5bca35b1f857bd3fd34fc0a46858cf (patch)
treeb0c02bc1d8a959272436409cf527e213840b4d55 /configdefinitions
parenta767ce95b82eb3674258717a5edc6e54816eb4cf (diff)
Allow configuring docker registry and Docker Vespa base image
Diffstat (limited to 'configdefinitions')
-rw-r--r--configdefinitions/src/vespa/configserver.def4
1 files changed, 4 insertions, 0 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def
index 87610c9ee4c..c12a0af32b0 100644
--- a/configdefinitions/src/vespa/configserver.def
+++ b/configdefinitions/src/vespa/configserver.def
@@ -33,3 +33,7 @@ defaultContainerFlavor string default="default"
defaultContentFlavor string default="default"
useVespaVersionInRequest bool default=false
+
+# Docker config
+dockerRegistry string default=""
+dockerVespaBaseImage string default=""