[PR #186] [MERGED] New Docker Setup #3508

Closed
opened 2026-03-14 07:23:50 +03:00 by kerem · 0 comments
Owner

📋 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: developHead: develop


📝 Commits (10+)

📊 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.

  • Added a SCRIPTS_DIR variable in settings
  • Moved the most mesh setup logic out of the Core Settings and into the initial_mesh_setup command
  • In the axios boot file, I am getting the API url at runtime if it exists and falling back to the node process variable.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/amidaware/tacticalrmm/pull/186 **Author:** [@sadnub](https://github.com/sadnub) **Created:** 11/20/2020 **Status:** ✅ Merged **Merged:** 11/20/2020 **Merged by:** [@wh1te909](https://github.com/wh1te909) **Base:** `develop` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`f05908f`](https://github.com/amidaware/tacticalrmm/commit/f05908f570c619bd050817b7478c5935302b467f) docker rework start - [`f4aab16`](https://github.com/amidaware/tacticalrmm/commit/f4aab16e396bef592b6db72950d0697b0cb1a6f3) more docker changes - [`bc0fc33`](https://github.com/amidaware/tacticalrmm/commit/bc0fc33966807abcad0e42a73e2dff5643a13197) more docker additions - [`759b05e`](https://github.com/amidaware/tacticalrmm/commit/759b05e137a5eb6eedcc90c3a36d68d59d2fa512) more docker changes - [`7592c11`](https://github.com/amidaware/tacticalrmm/commit/7592c11e99ca3998c85ca0c5ea15a0b5e56bf6d7) more docker changes - [`9ec2f6b`](https://github.com/amidaware/tacticalrmm/commit/9ec2f6b64da72f13183e58244bdd4be262cf62a9) more docker changes - [`e83e73e`](https://github.com/amidaware/tacticalrmm/commit/e83e73ead467c5e86378a50bea0562c590e26f81) finished up docker - [`337c900`](https://github.com/amidaware/tacticalrmm/commit/337c9007708d3398c8e00ff025ab6f516f603a3e) fix merge conflicts - [`f7bcd24`](https://github.com/amidaware/tacticalrmm/commit/f7bcd2472644cdf19221c9acaaff1020d2f5a3e4) working docker setup with Dockerhub - [`a74dde5`](https://github.com/amidaware/tacticalrmm/commit/a74dde5d9ef1aee9e0d38a1e53b22f00a471fbb7) attempt tests fix ### 📊 Changes **42 files changed** (+916 additions, -893 deletions) <details> <summary>View changed files</summary> 📝 `.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_ </details> ### 📄 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. - Added a SCRIPTS_DIR variable in settings - Moved the most mesh setup logic out of the Core Settings and into the initial_mesh_setup command - In the axios boot file, I am getting the API url at runtime if it exists and falling back to the node process variable. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-03-14 07:23:50 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/tacticalrmm#3508
No description provided.