Merge branch 'feature/samplyBeam' into log_git_errors

This commit is contained in:
Martin Lablans 2022-11-04 16:23:49 +01:00 committed by GitHub
commit c31de507a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

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 Executable file → Normal file
View File

@ -129,8 +129,13 @@ 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)