Merge branch 'feature/samplyBeam' into log_git_errors
This commit is contained in:
commit
c31de507a6
|
@ -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)
|
||||||
|
|
|
@ -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)
|
|
||||||
|
|
Loading…
Reference in New Issue