diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 9e2da32..3ea646c 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -61,14 +61,40 @@ jobs: set -euo pipefail export DOCKER_API_VERSION=1.43 - # Ensure required networks exist - docker network inspect nas-dashboard_internal >/dev/null 2>&1 || docker network create nas-dashboard_internal - docker network inspect gitea_gitea >/dev/null 2>&1 || docker network create gitea_gitea - cd /volume1/docker/nas-dashboard # Stop and remove existing container if it exists docker compose -f docker-compose.dev.yml down --remove-orphans || true - # Deploy - docker compose -f docker-compose.dev.yml up -d --pull never + # Deploy with host network to avoid network conflicts in CI + # The runner is already in gitea_gitea network, causing conflicts + docker run -d \ + --name nas-dashboard-dev \ + --restart unless-stopped \ + -p 127.0.0.1:4001:4000 \ + --network host \ + -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 \ + -v /volume1/docker/nas-dashboard/ssh/mac_terminal:/app/ssh/mac_id_ed25519:ro \ + -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 VOLUME_ROOT=/volume1 \ + -e SSH_HOST=host.docker.internal \ + -e SSH_USER=zjgump \ + -e VPS_SSH_HOST=158.101.140.85 \ + -e VPS_SSH_USER=jimmyg \ + -e CADDY_VPS_SSH_HOST=161.33.182.109 \ + -e CADDY_VPS_SSH_USER=ubuntu \ + -e MAC_SSH_HOST=192.168.31.22 \ + -e MAC_SSH_USER=jimmyg \ + -e ADMIN_USER=jimmy \ + -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_API_KEY=anything \ + nas-dashboard-dev:latest