From 5f620f817dd9778b5fc45e433368c1bb4d6e9f45 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 11 Mar 2020 12:28:21 +0100 Subject: Add support for using a Docker image repository when deploying an application Preliminary support only, not completed --- config-model-api/abi-spec.json | 1 + .../src/main/java/com/yahoo/config/model/api/ModelContext.java | 3 +++ 2 files changed, 4 insertions(+) (limited to 'config-model-api') 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 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 wantedDockerImageRepository() { return Optional.empty(); } + /** The Vespa version this model is built for */ Version modelVespaVersion(); -- cgit v1.2.3