[PR #5] [MERGED] Docker fix and cleanup #1484

New issue

Closed

opened 2026-03-02 02:23:29 +03:00 by kerem · 0 comments

kerem commented

2026-03-02 02:23:29 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amidaware/tacticalrmm/pull/5
Author: @sadnub
Created: 2/21/2020
Status: ✅ Merged
Merged: 2/22/2020
Merged by: @wh1te909

Base: develop ← Head: docker-fix

📝 Commits (7)

fbb4017 Fixed config files that were missing from git. Added email ARGs to the config
d0b7d34 Fixed file upload issue by modifying the reverse proxy to allow a higher body size
6d2f8bd Fix Salt container and create a user/password from .env
3bb8ae9 Fixed Scripts. Modified Nginx proxy to not depend on downstream containers being available on the network.
7408761 Fixed userdefined scripts permissions
3ceabc2 Remove debug from salt api config
735b5af Fix dockerfile

📊 Changes

14 files changed (+216 additions, -22 deletions)

View changed files

📝 docker/.env.example (+8 -0)
📝 docker/api/api.conf (+5 -0)
📝 docker/api/dockerfile (+19 -3)
➕ docker/api/local_settings.py.keep (+53 -0)
➕ docker/app/.env.local.keep (+2 -0)
📝 docker/app/dockerfile (+2 -2)
📝 docker/docker-compose.yml (+68 -7)
📝 docker/nginx-proxy/api.conf (+8 -1)
📝 docker/nginx-proxy/app.conf (+6 -1)
📝 docker/nginx-proxy/mesh.conf (+10 -2)
📝 docker/readme.md (+21 -3)
📝 docker/salt/api.conf (+2 -2)
➕ docker/salt/dockerfile (+12 -0)
➖ docker/salt/user.conf (+0 -1)

📄 Description

I made some fixes and verified everything is working correctly. I fixed the file upload issues and made some improvements.

_{🔄 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/5 **Author:** [@sadnub](https://github.com/sadnub) **Created:** 2/21/2020 **Status:** ✅ Merged **Merged:** 2/22/2020 **Merged by:** [@wh1te909](https://github.com/wh1te909) **Base:** `develop` ← **Head:** `docker-fix` --- ### 📝 Commits (7) - [`fbb4017`](https://github.com/amidaware/tacticalrmm/commit/fbb4017e3ce5c29fd90cb4fa058a3408613f6ab7) Fixed config files that were missing from git. Added email ARGs to the config - [`d0b7d34`](https://github.com/amidaware/tacticalrmm/commit/d0b7d347720907afa142214648a28c68a03d878a) Fixed file upload issue by modifying the reverse proxy to allow a higher body size - [`6d2f8bd`](https://github.com/amidaware/tacticalrmm/commit/6d2f8bd0c8a02ddb50ff193437735fba5ed0e073) Fix Salt container and create a user/password from .env - [`3bb8ae9`](https://github.com/amidaware/tacticalrmm/commit/3bb8ae98d449c8731fdd3b5f2bfdc787acb42607) Fixed Scripts. Modified Nginx proxy to not depend on downstream containers being available on the network. - [`7408761`](https://github.com/amidaware/tacticalrmm/commit/74087618e24cb04b191798cf13f65c47d3848c08) Fixed userdefined scripts permissions - [`3ceabc2`](https://github.com/amidaware/tacticalrmm/commit/3ceabc23bff79a7f468e62eb19c3014bf658dd87) Remove debug from salt api config - [`735b5af`](https://github.com/amidaware/tacticalrmm/commit/735b5af7222b6451660174481578a91667538d2f) Fix dockerfile ### 📊 Changes **14 files changed** (+216 additions, -22 deletions) <details> <summary>View changed files</summary> 📝 `docker/.env.example` (+8 -0) 📝 `docker/api/api.conf` (+5 -0) 📝 `docker/api/dockerfile` (+19 -3) ➕ `docker/api/local_settings.py.keep` (+53 -0) ➕ `docker/app/.env.local.keep` (+2 -0) 📝 `docker/app/dockerfile` (+2 -2) 📝 `docker/docker-compose.yml` (+68 -7) 📝 `docker/nginx-proxy/api.conf` (+8 -1) 📝 `docker/nginx-proxy/app.conf` (+6 -1) 📝 `docker/nginx-proxy/mesh.conf` (+10 -2) 📝 `docker/readme.md` (+21 -3) 📝 `docker/salt/api.conf` (+2 -2) ➕ `docker/salt/dockerfile` (+12 -0) ➖ `docker/salt/user.conf` (+0 -1) </details> ### 📄 Description I made some fixes and verified everything is working correctly. I fixed the file upload issues and made some improvements. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>