From 0584a474ccda0d81541e6a81e69dd2e066218367 Mon Sep 17 00:00:00 2001
From: huang <youdang2000@gmail.com>
Date: Tue, 20 Jan 2026 09:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E7=BD=B2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=9A=E4=BD=BF=E7=94=A8=20config.yaml=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE=E5=92=8C=E5=A4=96=E9=83=A8=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 docker-compose 中的 postgres 和 redis 服务（使用外部服务）
- 移除不必要的环境变量（DB_HOST 等）
- 修正服务端口：8088 → 3000（与 config.yaml 一致）
- 修正健康检查：curl → wget（与 Dockerfile 一致）
- 工作流自动复制 configs 目录和创建 logs 目录
- 使用默认 config.yaml（连接到 cxd.whcxd.cn 数据库）
---
 .gitea/workflows/deploy.yaml |  4 +++-
 docker-compose.prod.yml      | 15 ++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 956b15d..7e68a08 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -94,8 +94,10 @@ jobs:
           # 确保部署目录存在
           mkdir -p ${{ env.DEPLOY_DIR }}
           
-          # 复制 docker-compose.prod.yml 到部署目录
+          # 复制必要的文件和目录到部署目录
           cp docker-compose.prod.yml ${{ env.DEPLOY_DIR }}/
+          cp -r configs ${{ env.DEPLOY_DIR }}/
+          mkdir -p ${{ env.DEPLOY_DIR }}/logs
           
           cd ${{ env.DEPLOY_DIR }}
           
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index e03c697..de32063 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,23 +6,14 @@ services:
     container_name: junhong-cmp-api
     restart: unless-stopped
     ports:
-      - "8088:8088"
-    environment:
-      - CONFIG_ENV=prod
-      - DB_HOST=${DB_HOST}
-      - DB_PORT=${DB_PORT}
-      - DB_USER=${DB_USER}
-      - DB_PASSWORD=${DB_PASSWORD}
-      - DB_NAME=${DB_NAME}
-      - DB_SSLMODE=${DB_SSLMODE}
+      - "3000:3000"
     volumes:
       - ./configs:/app/configs:ro
       - ./logs:/app/logs
-      - ./.env:/app/.env:ro
     networks:
       - junhong-network
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8088/health"]
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/health"]
       interval: 30s
       timeout: 3s
       retries: 3
@@ -37,8 +28,6 @@ services:
     image: registry.boss160.cn/junhong/cmp-fiber-worker:latest
     container_name: junhong-cmp-worker
     restart: unless-stopped
-    environment:
-      - CONFIG_ENV=prod
     volumes:
       - ./configs:/app/configs:ro
       - ./logs:/app/logs