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
+3 -13
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70a222c1b6 - Show all commits
dashboard/docker-compose.dev.yml
+1 -6
View File
@@ -6,7 +6,7 @@ services:
ports: ports:
- "127.0.0.1:4001:4000" - "127.0.0.1:4001:4000"
environment: environment:
- DOCKER_HOST=tcp://docker-socket-proxy:2375 - DOCKER_HOST=tcp://host.docker.internal:2375
- GITEA_URL=http://gitea:3000 - GITEA_URL=http://gitea:3000
- GITEA_TOKEN=${GITEA_TOKEN} - GITEA_TOKEN=${GITEA_TOKEN}
- VOLUME_ROOT=/volume1 - VOLUME_ROOT=/volume1
@@ -31,11 +31,6 @@ services:
- LITELLM_API_KEY=anything - LITELLM_API_KEY=anything
- LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-} - LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-}
- GITEA_DB_PASSWORD=${GITEA_DB_PASSWORD} - GITEA_DB_PASSWORD=${GITEA_DB_PASSWORD}
deploy:
resources:
limits:
cpus: '0.5'
memory: 1G
volumes: volumes:
- /volume1:/volume1 - /volume1:/volume1
- /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro - /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro
dashboard/docker-compose.yml
+2 -7
View File
@@ -28,13 +28,8 @@ services:
restart: unless-stopped restart: unless-stopped
ports: ports:
- "127.0.0.1:4000:4000" - "127.0.0.1:4000:4000"
deploy:
resources:
limits:
cpus: '2.0'
memory: 2G
environment: environment:
- DOCKER_HOST=tcp://docker-socket-proxy:2375 - DOCKER_HOST=tcp://host.docker.internal:2375
- GITEA_URL=http://gitea:3000 - GITEA_URL=http://gitea:3000
- GITEA_TOKEN=${GITEA_TOKEN} - GITEA_TOKEN=${GITEA_TOKEN}
- VOLUME_ROOT=/volume1 - VOLUME_ROOT=/volume1
@@ -54,7 +49,7 @@ services:
- TELEGRAM_PROXY=${TELEGRAM_PROXY:-} - TELEGRAM_PROXY=${TELEGRAM_PROXY:-}
- CORS_ORIGINS=https://nas.jimmygan.com - CORS_ORIGINS=https://nas.jimmygan.com
- WEBAUTHN_RP_ID=jimmygan.com - WEBAUTHN_RP_ID=jimmygan.com
- WEBAUTHN_ORIGINS=https://nas.jimmygan.com,https://auth.jimmygan.com:8443 - WEBAUTHN_ORIGINS=https://nas.jimmygan.com,https://nas.jimmygan.com:8443,https://auth.jimmygan.com:8443
- LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-} - LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-}
- LITELLM_URL=http://litellm:4005 - LITELLM_URL=http://litellm:4005
- GITEA_DB_PASSWORD=${GITEA_DB_PASSWORD} - GITEA_DB_PASSWORD=${GITEA_DB_PASSWORD}