aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2022-12-06 13:15:01 +0100
committerGitHub <noreply@github.com>2022-12-06 13:15:01 +0100
commitb01ebe82c392cd08c2cfe736049ad3d61d91e2b5 (patch)
tree63c5c995cc69af00c1582d0d897d654d93107c3a
parente9df2e33f0192e0461c690146b2f8a3d85fa99cc (diff)
parent399b29951e37ba28d37d2145637a08b9513fc574 (diff)
Merge pull request #25125 from vespa-engine/arnej/test-standalone-container-start
test new startup for standalone container
-rwxr-xr-xstandalone-container/src/main/sh/standalone-container.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index 9a780f29c86..59a358240b6 100755
--- 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"