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
+8 -6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 135f9468ec - Show all commits
.gitea/workflows/deploy-dev.yml
+8 -6
View File
@@ -67,13 +67,12 @@ jobs:
docker compose -f docker-compose.dev.yml down --remove-orphans || true
docker rm -f nas-dashboard-dev || true
# Deploy with host network to avoid network conflicts in CI
# The runner is already in gitea_gitea network, causing conflicts
# Deploy with bridge networking to avoid port 4000 conflicts with Production
docker run -d \
--name nas-dashboard-dev \
--restart unless-stopped \
-p 127.0.0.1:4001:4000 \
--network host \
--network nas-dashboard_internal \
-v /volume1:/volume1 \
-v /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro \
-v /volume1/docker/nas-dashboard/ssh/vps_terminal:/app/ssh/vps_id_ed25519:ro \
@@ -81,8 +80,8 @@ jobs:
-v /volume1/docker/nas-dashboard/ssh/known_hosts:/app/ssh/known_hosts:ro \
-v /volume1/docker/chat-summarizer/data:/app/data/chat-summarizer:ro \
--add-host host.docker.internal:host-gateway \
-e DOCKER_HOST=tcp://127.0.0.1:2375 \
-e GITEA_URL=http://127.0.0.1:3300 \
-e DOCKER_HOST=tcp://docker-socket-proxy:2375 \
-e GITEA_URL=http://gitea:3000 \
-e VOLUME_ROOT=/volume1 \
-e SSH_HOST=host.docker.internal \
-e SSH_USER=zjgump \
@@ -96,7 +95,10 @@ jobs:
-e CORS_ORIGINS=https://dev.nas.jimmygan.com,https://dev.nas.jimmygan.com:8443 \
-e WEBAUTHN_RP_ID=jimmygan.com \
-e WEBAUTHN_ORIGINS=https://dev.nas.jimmygan.com,https://dev.nas.jimmygan.com:8443,https://auth.jimmygan.com:8443 \
-e LITELLM_URL=http://127.0.0.1:4005 \
-e LITELLM_URL=http://litellm:4005 \
-e LITELLM_API_KEY=anything \
-e SECRET_KEY=c0e8dcd74b2d70c596dfa03928f2582ca8d88af04896a82ee6c2aeeaa6bd6199 \
nas-dashboard-dev:latest
# Connect to gitea_gitea network for database access (OPC_DB)
docker network connect gitea_gitea nas-dashboard-dev || true