verbis-admin
/
bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from samply/hostname 

Allow to read hostname from config file
This commit is contained in:
Martin Lablans 2022-11-04 16:22:37 +01:00 committed by GitHub
parent ab3a5790de 6b2168ff11
commit 320e3f163b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridgehead
View File

@ -59,6 +59,7 @@ if [ -f "$PROJECT/docker-compose.override.yml" ]; then
fi fi
detectCompose detectCompose
setHostname
case "$ACTION" in case "$ACTION" in
start) start)

9
lib/functions.sh
View File

@ -125,12 +125,17 @@ fail_and_report() {
exit $1 exit $1
} }
setHostname() {
if [ -z "$HOST" ]; then
export HOST=$(hostname -f)
log DEBUG "Using auto-detected hostname $HOST."
fi
}
##Setting Network properties ##Setting Network properties
# currently not needed # currently not needed
#export HOSTIP=$(MSYS_NO_PATHCONV=1 docker run --rm --add-host=host.docker.internal:host-gateway ubuntu cat /etc/hosts | grep 'host.docker.internal' | awk '{print $1}'); #export HOSTIP=$(MSYS_NO_PATHCONV=1 docker run --rm --add-host=host.docker.internal:host-gateway ubuntu cat /etc/hosts | grep 'host.docker.internal' | awk '{print $1}');
export HOST=$(hostname -f)
export PRODUCTION="false"; export PRODUCTION="false";
if [ "$(git branch --show-current)" == "main" ]; then if [ "$(git branch --show-current)" == "main" ]; then
export PRODUCTION="true"; export PRODUCTION="true";