From 2b419cebb573095d6898e9a80123dcac9e271fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=BD=E5=93=92=E5=93=92?= Date: Wed, 18 Mar 2026 23:25:04 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E5=91=BD=E5=90=8D=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E4=B8=BA=20cywl-scoring-*=20=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E4=B8=8E=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=85=B6=E4=BB=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yaml | 4 ++-- docker-compose.yml | 18 +++++++++--------- frontend/nginx.conf | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 2ce8c46..9ab4477 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -39,8 +39,8 @@ jobs: echo $SUDO_PASSWORD | sudo -S docker compose down --remove-orphans 2>/dev/null || true # 等待容器完全停止 sleep 5 - # 强制删除可能残留的容器 - echo $SUDO_PASSWORD | sudo -S docker ps -aq --filter "name=scoring" | xargs -r docker rm -f 2>/dev/null || true + # 清理本项目残留容器(避免影响其他项目) + echo $SUDO_PASSWORD | sudo -S docker ps -aq --filter "name=cywl-scoring" | xargs -r docker rm -f 2>/dev/null || true # 4. 拉取 Git 最新代码 echo -e "\n===== 拉取 Git 代码 =====" diff --git a/docker-compose.yml b/docker-compose.yml index 3da7098..be313f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,11 @@ version: '3.8' services: # 后端服务 - backend: + scoring-backend: build: context: ./backend dockerfile: Dockerfile - container_name: scoring_backend + container_name: cywl-scoring-backend restart: always volumes: - ./backend/media:/app/media @@ -41,18 +41,18 @@ services: start_period: 40s # 前端服务 (Nginx) - frontend: + scoring-frontend: build: context: ./frontend dockerfile: Dockerfile args: - VITE_API_URL=/api - container_name: scoring_frontend + container_name: cywl-scoring-frontend restart: always ports: - "80:80" depends_on: - backend: + scoring-backend: condition: service_healthy networks: - scoring_network @@ -63,9 +63,9 @@ services: retries: 3 # Nginx 反向代理 (可选,用于负载均衡和 SSL) - nginx: + scoring-nginx: image: nginx:alpine - container_name: scoring_nginx + container_name: cywl-scoring-nginx restart: always ports: - "443:443" @@ -73,8 +73,8 @@ services: - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro - ./nginx/ssl:/etc/nginx/ssl:ro depends_on: - - frontend - - backend + - scoring-frontend + - scoring-backend networks: - scoring_network profiles: diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 298234e..511e610 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -25,7 +25,7 @@ server { # API 代理 - 将 /api 请求转发到后端 location /api/ { - proxy_pass http://backend:8000/api/; + proxy_pass http://scoring-backend:8876/api/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -38,7 +38,7 @@ server { # 媒体文件代理 location /media/ { - proxy_pass http://backend:8000/media/; + proxy_pass http://scoring-backend:8876/media/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -46,7 +46,7 @@ server { # 静态文件代理 location /static/ { - proxy_pass http://backend:8000/static/; + proxy_pass http://scoring-backend:8876/static/; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;