mirror of
https://github.com/amidaware/tacticalrmm.git
synced 2026-04-26 15:05:57 +03:00
[PR #186] [MERGED] New Docker Setup #3508
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#3508
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/186
Author: @sadnub
Created: 11/20/2020
Status: ✅ Merged
Merged: 11/20/2020
Merged by: @wh1te909
Base:
develop← Head:develop📝 Commits (10+)
f05908fdocker rework startf4aab16more docker changesbc0fc33more docker additions759b05emore docker changes7592c11more docker changes9ec2f6bmore docker changese83e73efinished up docker337c900fix merge conflictsf7bcd24working docker setup with Dockerhuba74dde5attempt tests fix📊 Changes
42 files changed (+916 additions, -893 deletions)
View changed files
📝
.gitignore(+1 -0)📝
api/tacticalrmm/core/management/commands/initial_mesh_setup.py(+83 -53)📝
api/tacticalrmm/core/models.py(+1 -63)📝
api/tacticalrmm/scripts/models.py(+4 -8)📝
api/tacticalrmm/scripts/serializers.py(+2 -1)📝
api/tacticalrmm/scripts/tests.py(+3 -1)📝
api/tacticalrmm/tacticalrmm/settings.py(+5 -9)📝
docker/.env.example(+15 -18)➖
docker/api/api.conf(+0 -64)➖
docker/api/dockerfile(+0 -46)➖
docker/api/local_settings.py.keep(+0 -47)➖
docker/api/prestart.sh(+0 -10)➖
docker/api/uwsgi.ini(+0 -14)➖
docker/app/.env.keep(+0 -2)➖
docker/app/app.conf(+0 -16)➖
docker/app/dockerfile(+0 -19)➕
docker/containers/tactical-frontend/dockerfile(+23 -0)➕
docker/containers/tactical-frontend/entrypoint.sh(+31 -0)➕
docker/containers/tactical-meshcentral/dockerfile(+14 -0)➕
docker/containers/tactical-meshcentral/entrypoint.sh(+66 -0)...and 22 more files
📄 Description
I was able to get the tests to pass in the docker env. I made some small changes to the code base to make setup easier.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.