Allow configuring docker registry and Docker Vespa base image

5 files changed, 20 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 156b8c980de..ef698c1f196 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -135,6 +135,12 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.numParallelTenantLoaders().isPresent()) {
             builder.numParallelTenantLoaders(options.numParallelTenantLoaders().get());
         }
+        if (options.dockerRegistry().isPresent()) {
+            builder.dockerRegistry(options.dockerRegistry().get());
+        }
+        if (options.dockerVespaBaseImage().isPresent()) {
+            builder.dockerVespaBaseImage(options.dockerVespaBaseImage().get());
+        }
     }
 
     private String[] getConfigModelPluginDirs() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index 57c4691f523..f895d063884 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -41,4 +41,6 @@ public interface CloudConfigOptions {
     Optional<String> defaultContentFlavor();
     Optional<Boolean> useVespaVersionInRequest();
     Optional<Integer> numParallelTenantLoaders();
+    Optional<String> dockerRegistry();
+    Optional<String> dockerVespaBaseImage();
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index 31651c5166b..0ba46005040 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -109,6 +109,12 @@ public class TestOptions implements CloudConfigOptions {
     @Override
     public Optional<Integer> numParallelTenantLoaders() { return numParallelTenantLoaders; }
 
+    @Override
+    public Optional<String> dockerRegistry() { return Optional.empty(); }
+
+    @Override
+    public Optional<String> dockerVespaBaseImage() { return Optional.empty(); }
+
     public TestOptions numParallelTenantLoaders(int numLoaders) {
         this.numParallelTenantLoaders = Optional.of(numLoaders);
         return this;
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=""
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 {