jimmy/nas-tools
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge dev to main: Security improvements and comprehensive test infrastructure #39

Merged
jimmy merged 195 commits from dev into main 2026-04-08 01:42:27 +08:00
Conversation 0 Commits 195 Files Changed 87
+7 -4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6cf757d6b - Show all commits
.gitea/workflows/deploy-dev.yml
+7 -4
View File
@@ -64,15 +64,18 @@ jobs:
cd /volume1/docker/nas-dashboard cd /volume1/docker/nas-dashboard
# Clean up any legacy manual containers # Stop and remove any existing container
docker compose -f docker-compose.dev.yml -p nas-dashboard-dev down --remove-orphans || true
docker rm -f nas-dashboard-dev 2>/dev/null || true docker rm -f nas-dashboard-dev 2>/dev/null || true
# Disconnect from networks if still connected
docker network disconnect nas-dashboard_internal nas-dashboard-dev 2>/dev/null || true
docker network disconnect gitea_gitea nas-dashboard-dev 2>/dev/null || true
# Ensure network exists (create only if it doesn't exist) # Ensure network exists (create only if it doesn't exist)
if ! docker network inspect nas-dashboard_internal >/dev/null 2>&1; then if ! docker network inspect nas-dashboard_internal >/dev/null 2>&1; then
docker network create nas-dashboard_internal docker network create nas-dashboard_internal
fi fi
# Use a dedicated project name to avoid killing production (which is project 'nas-dashboard') # Deploy with compose
# and deploy using the synced compose file.
docker compose -f docker-compose.dev.yml -p nas-dashboard-dev down --remove-orphans || true
docker compose -f docker-compose.dev.yml -p nas-dashboard-dev up -d --build --pull never docker compose -f docker-compose.dev.yml -p nas-dashboard-dev up -d --build --pull never