diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-05-09 14:00:59 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-05-14 10:08:15 +0000 |
| commit | cc5f5b2b41db293a9ce7ef554adde9e776fd1ad2 (patch) | |
| tree | 4afd49f607f3b11f077aa61a8187585dcfa98dbe /standalone-container | |
| parent | 5224e612edc9f5af2f93051a41000a36ca6c5c93 (diff) | |
update bootstrap section of scripts
Diffstat (limited to 'standalone-container')
| -rwxr-xr-x | standalone-container/src/main/sh/jdisc_container_start | 9 | ||||
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/standalone-container/src/main/sh/jdisc_container_start b/standalone-container/src/main/sh/jdisc_container_start index 5fb4642a21d..a41913326d7 100755 --- a/standalone-container/src/main/sh/jdisc_container_start +++ b/standalone-container/src/main/sh/jdisc_container_start @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index c5747faf0d5..8af36a98ab4 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section |