Rooba
/
tacticalrmm
mirror of https://github.com/amidaware/tacticalrmm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mesh container and wait for nginx

This commit is contained in:
Josh Krawczyk 2020-11-27 21:08:20 -05:00
parent da163d44e7
commit 2f07337588
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/containers/tactical-meshcentral/entrypoint.sh
View File

@ -62,5 +62,11 @@ if [ ! -f "${TACTICAL_DIR}/tmp/mesh_token" ]; then
node node_modules/meshcentral --logintokenkey > ${TACTICAL_DIR}/tmp/mesh_token node node_modules/meshcentral --logintokenkey > ${TACTICAL_DIR}/tmp/mesh_token
fi fi
# wait for nginx container
until (echo > /dev/tcp/"${NGINX_HOST_IP}"/443) &> /dev/null; do
echo "waiting for nginx to start..."
sleep 5
done
# start mesh # start mesh
node node_modules/meshcentral node node_modules/meshcentral

1
docker/docker-compose.yml
View File

@ -51,6 +51,7 @@ services:
POSTGRES_PASS: ${POSTGRES_PASS} POSTGRES_PASS: ${POSTGRES_PASS}
APP_HOST: ${APP_HOST} APP_HOST: ${APP_HOST}
API_HOST: ${API_HOST} API_HOST: ${API_HOST}
MESH_USER: ${MESH_USER}
MESH_HOST: ${MESH_HOST} MESH_HOST: ${MESH_HOST}
TRMM_USER: ${TRMM_USER} TRMM_USER: ${TRMM_USER}
TRMM_PASS: ${TRMM_PASS} TRMM_PASS: ${TRMM_PASS}