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