From 70a222c1b6e889dd221eb985063745360e5a49b9 Mon Sep 17 00:00:00 2001 From: "Gan, Jimmy" Date: Mon, 6 Apr 2026 18:17:08 +0800 Subject: [PATCH] fix: remove resource limits and use host.docker.internal for dashboard - Remove CPU/memory limits that were causing issues - Switch from docker-socket-proxy to host.docker.internal - Add nas.jimmygan.com:8443 to WEBAUTHN_ORIGINS for proper auth --- dashboard/docker-compose.dev.yml | 7 +------ dashboard/docker-compose.yml | 9 ++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dashboard/docker-compose.dev.yml b/dashboard/docker-compose.dev.yml index b0ba71c..fc12321 100644 --- a/dashboard/docker-compose.dev.yml +++ b/dashboard/docker-compose.dev.yml @@ -6,7 +6,7 @@ services: ports: - "127.0.0.1:4001:4000" environment: - - DOCKER_HOST=tcp://docker-socket-proxy:2375 + - DOCKER_HOST=tcp://host.docker.internal:2375 - GITEA_URL=http://gitea:3000 - GITEA_TOKEN=${GITEA_TOKEN} - VOLUME_ROOT=/volume1 @@ -31,11 +31,6 @@ services: - LITELLM_API_KEY=anything - LITELLM_HEALTH_API_KEY=${LITELLM_HEALTH_API_KEY:-} - GITEA_DB_PASSWORD=${GITEA_DB_PASSWORD} - deploy: - resources: - limits: - cpus: '0.5' - memory: 1G volumes: - /volume1:/volume1 - /volume1/docker/nas-dashboard/ssh/dashboard_terminal:/app/ssh/id_ed25519:ro diff --git a/dashboard/docker-compose.yml b/dashboard/docker-compose.yml index 39c8141..82cc1bc 100644 --- a/dashboard/docker-compose.yml +++ b/dashboard/docker-compose.yml @@ -28,13 +28,8 @@ services: restart: unless-stopped ports: - "127.0.0.1:4000:4000" - deploy: - resources: - limits: - cpus: '2.0' - memory: 2G environment: - - DOCKER_HOST=tcp://docker-socket-proxy:2375 + - DOCKER_HOST=tcp://host.docker.internal:2375 - GITEA_URL=http://gitea:3000 - GITEA_TOKEN=${GITEA_TOKEN} - VOLUME_ROOT=/volume1 @@ -54,7 +49,7 @@ services: - TELEGRAM_PROXY=${TELEGRAM_PROXY:-} - CORS_ORIGINS=https://nas.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_URL=http://litellm:4005 - GITEA_DB_PASSWORD=${GITEA_DB_PASSWORD}