MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-07-16 04:11:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor Docker fixes and nice things (#7120)

Browse Source
This commit is contained in:
DaanSelen 2025-06-25 01:13:04 +02:00 committed by GitHub
parent 0aaab322ad
commit 0b6d4b28be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/compose.yaml
View File

@ -2,10 +2,11 @@ services:
meshcentral: meshcentral:
image: ghcr.io/ylianst/meshcentral:latest image: ghcr.io/ylianst/meshcentral:latest
environment: environment:
- HOSTNAME=myserver.domain.com - DYNAMIC_CONFIG=false # Show the option but disable it by default, for safety.
- ALLOW_NEW_ACCOUNTS=false - HOSTNAME=myserver.domain.com # Set the hostname in the config.json
- USE_MONGODB=true - ALLOW_NEW_ACCOUNTS=false # Disable creation of new accounts (except for the first user) in the config.json
- MONGO_URL=mongodb://username:password@mongodb:27017/meshcentral - USE_MONGODB=true # Enable the Mongo connector in the config.json
- MONGO_URL=mongodb://username:password@mongodb:27017/meshcentral # Example MONGO_URL
volumes: volumes:
- meshcentral-data:/opt/meshcentral/meshcentral-data - meshcentral-data:/opt/meshcentral/meshcentral-data
- meshcentral-files:/opt/meshcentral/meshcentral-files - meshcentral-files:/opt/meshcentral/meshcentral-files

7
docker/entrypoint.sh
View File

@ -22,7 +22,6 @@ else
fi fi
if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then
cat "$CONFIG_FILE"
echo "Using Dynamic Configuration values..." echo "Using Dynamic Configuration values..."
# BEGIN DATABASE CONFIGURATION FIELDS # BEGIN DATABASE CONFIGURATION FIELDS
@ -245,7 +244,7 @@ if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then
# certUrl # certUrl
if [[ -n $REVERSE_PROXY ]] && [[ -n $REVERSE_PROXY_TLS_PORT ]]; then if [[ -n $REVERSE_PROXY ]] && [[ -n $REVERSE_PROXY_TLS_PORT ]]; then
REVERSE_PROXY_STRING="${REVERSE_PROXY}:${REVERSE_PROXY_TLS_PORT}" REVERSE_PROXY_STRING="${REVERSE_PROXY}:${REVERSE_PROXY_TLS_PORT}"
echo "Setting certUrl... - $REVERSE_PROXY_STRING" echo "Setting certUrl... - $REVERSE_PROXY_STRING"
sed -i 's/"_certUrl"/"certUrl"/' "$CONFIG_FILE" sed -i 's/"_certUrl"/"certUrl"/' "$CONFIG_FILE"
jq --arg cert_url "$REVERSE_PROXY_STRING" \ jq --arg cert_url "$REVERSE_PROXY_STRING" \
@ -257,7 +256,7 @@ if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then
sed -i 's/"certUrl":/"_certUrl":/g' "$CONFIG_FILE" sed -i 's/"certUrl":/"_certUrl":/g' "$CONFIG_FILE"
fi fi
echo -e "\n$(cat "$CONFIG_FILE")" cat "$CONFIG_FILE"
else else
echo "Leaving config as-is." echo "Leaving config as-is."
fi fi
@ -266,4 +265,4 @@ fi
node /opt/meshcentral/meshcentral/meshcentral --configfile "${CONFIG_FILE}" "${ARGS}" >> /proc/1/fd/1 & node /opt/meshcentral/meshcentral/meshcentral --configfile "${CONFIG_FILE}" "${ARGS}" >> /proc/1/fd/1 &
meshcentral_pid=$! meshcentral_pid=$!
wait "$meshcentral_pid" wait "$meshcentral_pid"