mirror of
https://github.com/amidaware/tacticalrmm.git
synced 2026-04-26 15:05:57 +03:00
[PR #1109] [CLOSED] Changes to Docker files and mesh entrypoint.sh #3775
Labels
No labels
In Process
bug
bug
dev-triage
documentation
duplicate
enhancement
fixed
good first issue
help wanted
integration
invalid
pull-request
question
requires agent update
security
ui tweak
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/tacticalrmm#3775
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/amidaware/tacticalrmm/pull/1109
Author: @ninjamonkey198206
Created: 5/1/2022
Status: ❌ Closed
Base:
develop← Head:develop📝 Commits (10+)
701d226Update entrypoint.sh59398f9Update docker-compose.yml4d63b60Update .env.exampled66301eMerge branch 'amidaware:develop' into develop242e572Update create_natsapi_conf.py2285db1Update settings.pya5a28c3Update settings.py196a31eUpdate create_natsapi_conf.pyd6d230cMerge branch 'amidaware:develop' into develope2979abMerge branch 'amidaware:develop' into develop📊 Changes
3 files changed (+135 additions, -42 deletions)
View changed files
📝
docker/.env.example(+78 -11)📝
docker/containers/tactical-meshcentral/entrypoint.sh(+6 -4)📝
docker/docker-compose.yml(+51 -27)📄 Description
Update docker-compose.yml
Added variables x_GATEWAY and x_SUBNET to specify gateways and subnets to prevent occasional issues with gateways not properly initializing.
Added variable PROXY_IP for nginx proxy IP address that both sets the IP and informs mesh container of address per NGINX_HOST_IP entrypoint.sh variable.
Added container prefix variable CONTAINER_PREFIX to allow for easy deployment of multiple instances side by side by preventing same container names.
Added PROXY_HTTP_PORT and PROXY_HTTPS_PORT variables to set exposed proxy ports.
Added OS level network name variables PROXY_NET_NAME and API_DB_NET_NAME for proxy and api to alleviate issues when dealing with IPTables firewalls. Network names will stay consistent through reboots and other changes unless specifically edited. No br-blahblahblah to keep track of.
Added variable NATS_PORT to allow exposed nats port other than 4222. May need to update nats entrypoint.sh to be useful.
Filled out all network configs.
Update .env.example
Update entrypoint.sh
Add Agent Alias and Alias port variables to allow env variable alteration.
Changed agent alias and alias port conf to use variables rather than hardcoded ports.
Changed SMTP user variable default definition to example@example.com, because it was what was listed in the later command, and I'm anal-retentive.
Changed mesh account creation command to use the smtp user variable instead of being hardcoded to example@example.com.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.