summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-03-11 12:28:21 +0100
committerHarald Musum <musum@verizonmedia.com>2020-03-11 12:28:21 +0100
commit5f620f817dd9778b5fc45e433368c1bb4d6e9f45 (patch)
tree93df3f7928dea89e899f14a51814dc470775f5f0 /config-model-api
parent811cb02ae056b5b61520fa578ec5a90bcb6a4c4f (diff)
Add support for using a Docker image repository when deploying an application
Preliminary support only, not completed
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/abi-spec.json1
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 8556fd4a40b..e1e3d6f610c 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -904,6 +904,7 @@
"public abstract com.yahoo.config.application.api.FileRegistry getFileRegistry()",
"public abstract com.yahoo.config.model.api.ModelContext$Properties properties()",
"public java.util.Optional appDir()",
+ "public java.util.Optional wantedDockerImageRepository()",
"public abstract com.yahoo.component.Version modelVespaVersion()",
"public abstract com.yahoo.component.Version wantedNodeVespaVersion()"
],
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 87068182025..39d1f8096b6 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
@@ -32,6 +32,9 @@ public interface ModelContext {
Properties properties();
default Optional<File> appDir() { return Optional.empty();}
+ /** 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 Vespa version this model is built for */
Version modelVespaVersion();