summaryrefslogtreecommitdiffstats
path: root/standalone-container
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 /standalone-container
parenta767ce95b82eb3674258717a5edc6e54816eb4cf (diff)
Allow configuring docker registry and Docker Vespa base image
Diffstat (limited to 'standalone-container')
-rw-r--r--standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala
index 0a53200d970..f0447d492bc 100644
--- a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala
@@ -36,6 +36,8 @@ class CloudConfigYinstVariables extends CloudConfigOptions {
override val useVespaVersionInRequest = optionalYinstVar[java.lang.Boolean]("use_vespa_version_in_request")
override val hostedVespa = optionalYinstVar[java.lang.Boolean]("hosted_vespa")
override val numParallelTenantLoaders = optionalYinstVar[java.lang.Integer]("num_parallel_tenant_loaders")
+ override val dockerRegistry = optionalYinstVar[java.lang.String]("docker_registry")
+ override val dockerVespaBaseImage = optionalYinstVar[java.lang.String]("docker_vespa_base_image")
}
object CloudConfigYinstVariables {