mirror of
https://github.com/amidaware/tacticalrmm.git
synced 2026-04-26 15:05:57 +03:00
[PR #4] [MERGED] Docker Support for easy spin up #3435
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#3435
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/4
Author: @sadnub
Created: 2/12/2020
Status: ✅ Merged
Merged: 2/15/2020
Merged by: @wh1te909
Base:
develop← Head:develop📝 Commits (5)
c0edbaeAdd inital docker container supportf92f253Modify install script to include REDIS_HOST setting3442371Modify install script to include SALT_HOST settingb27e055Update TravisCI settings for build1203f8aUpdate readme.md📊 Changes
24 files changed (+596 additions, -7 deletions)
View changed files
📝
api/tacticalrmm/agents/models.py(+4 -4)📝
api/tacticalrmm/tacticalrmm/celery.py(+4 -3)📝
api/tacticalrmm/tacticalrmm/local_settings.py.example(+2 -0)📝
api/tacticalrmm/tacticalrmm/settings.py(+4 -0)➕
docker/.env.example(+21 -0)➕
docker/.gitignore(+1 -0)➕
docker/api/api.conf(+59 -0)➕
docker/api/dockerfile(+29 -0)➕
docker/api/prestart.sh(+5 -0)➕
docker/api/uwsgi.ini(+12 -0)➕
docker/app/app.conf(+16 -0)➕
docker/app/dockerfile(+17 -0)➕
docker/docker-compose.yml(+170 -0)➕
docker/meshcentral/config.json(+31 -0)➕
docker/meshcentral/dockerfile(+11 -0)➕
docker/nginx-proxy/api.conf(+34 -0)➕
docker/nginx-proxy/app.conf(+35 -0)➕
docker/nginx-proxy/cert/.gitignore(+1 -0)➕
docker/nginx-proxy/dockerfile(+27 -0)➕
docker/nginx-proxy/mesh.conf(+39 -0)...and 4 more files
📄 Description
I added a docker folder with all of the settings and configs. Everything appears to be working correctly. I did have to edit a few of the hard-coded addresses, but I added settings so that the install script will continue to function.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.