summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-04-22 13:27:16 +0200
committerHarald Musum <musum@verizonmedia.com>2020-04-22 13:27:16 +0200
commit824aa65535493c8ce7938059e4fee3bdcb5d0ed1 (patch)
tree4ed44930541d00968ab08658bc2cdd8b76784e7e /config-model-api
parentfa3b0772979e07edd0bcd7bf8845794fe9d559e1 (diff)
Use DockerImage instead of String
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index c406fa80434..151a881eabe 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -7,6 +7,7 @@ import com.yahoo.config.application.api.DeployLogger;
import com.yahoo.config.application.api.FileRegistry;
import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.AthenzDomain;
+import com.yahoo.config.provision.DockerImage;
import com.yahoo.config.provision.HostName;
import com.yahoo.config.provision.Zone;
@@ -34,9 +35,13 @@ public interface ModelContext {
Properties properties();
default Optional<File> appDir() { return Optional.empty();}
+ // TODO: Remove when 7.211 is oldest model version in use
/** The Docker image repo we want to use for images for this deployment (optional, will use default if empty) */
default Optional<String> wantedDockerImageRepository() { return Optional.empty(); }
+ /** The Docker image repo we want to use for images for this deployment (optional, will use default if empty) */
+ default Optional<DockerImage> wantedDockerImageRepo() { return Optional.empty(); }
+
/** The Vespa version this model is built for */
Version modelVespaVersion();