Merge pull request #25125 from vespa-engine/arnej/test-standalone-con…

…tainer-start test new startup for standalone container
vespa-engine · Dec 6, 2022 · b01ebe8 · b01ebe8
2 parents e9df2e3 + 399b299
commit b01ebe8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
@@ -132,6 +132,12 @@ StartCommand() {
     # common setup
     export VESPA_SERVICE_NAME="$service"
 
+    if grep -q '"region": "cd-us-west-1"' /etc/vespa/host-admin.json; then
+        ${VESPA_HOME}/libexec/vespa/script-utils run-standalone-container "${jvm_arguments[@]}" &
+        echo $! > "$pidfile"
+        return
+    fi
+
     # stuff for the process:
     local appdir="${VESPA_HOME}/conf/$service-app"
     local cfpfile="${VESPA_HOME}/var/jdisc_container/$service.properties"