diff options
| author | Arne Juul <arnej@yahooinc.com> | 2022-11-30 12:18:32 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2022-11-30 12:18:32 +0000 |
| commit | 447ee16af200776eb7b93b028ce34013900d4c3a (patch) | |
| tree | c8fe2ed41ae7fd0bf4ca10483588eff48c2978ff | |
| parent | f611155a289870ad02b79e0cb9068a9fa1d55f67 (diff) | |
always use "go" version of vespa-start-container-daemon
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 3 | ||||
| -rw-r--r-- | config-model/src/test/cfg/application/embed/services.xml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 8094eae881f..9729ee59c5c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -301,9 +301,6 @@ public abstract class Container extends AbstractService implements } public Optional<String> getStartupCommand() { - if (useOldStartupScript) { - return Optional.of("PRELOAD=" + getPreLoad() + " exec vespa-start-container-daemon " + getJvmOptions() + " "); - } return Optional.of("PRELOAD=" + getPreLoad() + " exec ${VESPA_HOME}/libexec/vespa/script-utils vespa-start-container-daemon " + getJvmOptions() + " "); } diff --git a/config-model/src/test/cfg/application/embed/services.xml b/config-model/src/test/cfg/application/embed/services.xml index cdbcfd67f02..fcb1f10f32c 100644 --- a/config-model/src/test/cfg/application/embed/services.xml +++ b/config-model/src/test/cfg/application/embed/services.xml @@ -4,7 +4,7 @@ <container version="1.0"> - <component id="transformer" class="ai.vespa.embedding.BertBaseEmbedder" bindle="model-integration"> + <component id="transformer" class="ai.vespa.embedding.BertBaseEmbedder" bundle="model-integration"> <config name="embedding.bert-base-embedder"> <!-- model specifics --> <transformerModel model-id="minilm-l6-v2" url="application-url"/> |