feat(config): 添加环境变量配置支持动态镜像和端口设置

- 在 .env.example 中添加 SERVER_BASE_IMAGE、SERVER_INTERNAL_PORT 等配置项
- 添加前端构建相关的 NODE_IMAGE 和 NGINX_IMAGE 配置
- 添加客户端 H5 和原生应用的 API 基础路径配置
- 支持动态端口配置以提高部署灵活性

feat(docker): 更新 Dockerfile 使用参数化镜像和端口配置

- 修改 server/Dockerfile 支持动态基础镜像和内部端口
- 更新 admin-web/Dockerfile 使用参数化镜像配置
- 修改 clients/Dockerfile 支持客户端多环境配置参数
- 所有 Dockerfile 现在使用 ARG 参数进行灵活配置

feat(nginx): 优化 Nginx 配置支持动态端口代理

- 更新 Nginx 配置文件使用环境变量定义监听端口
- 配置三个独立的服务端口分别处理客户端、管理后台和服务器API
- 添加完整的代理头信息设置以支持正确的请求转发
- 使用 Nginx 环境变量实现灵活的服务间通信

feat(deploy): 完善 docker-compose.yml 的环境变量集成

- 更新 docker-compose.yml 文件以使用新的环境变量配置
- 配置服务健康检查使用动态端口
- 设置 Nginx 容器环境变量以支持模板化配置
- 修复服务间通信端口使用环境变量替代硬编码值
This commit is contained in:
2026-05-09 18:03:38 +08:00
parent 19db342507
commit 9de0a56afa
7 changed files with 105 additions and 33 deletions
+27 -7
View File
@@ -60,11 +60,14 @@ services:
build:
context: ./server
args:
SERVER_BASE_IMAGE: "${SERVER_BASE_IMAGE}"
PIP_INDEX_URL: "${PIP_INDEX_URL}"
PIP_TRUSTED_HOST: "${PIP_TRUSTED_HOST}"
PIP_DEFAULT_TIMEOUT: "${PIP_DEFAULT_TIMEOUT}"
SERVER_INTERNAL_PORT: "${SERVER_INTERNAL_PORT}"
container_name: ciyuan-server
environment:
SERVER_INTERNAL_PORT: "${SERVER_INTERNAL_PORT}"
DATABASE_URL: "${DATABASE_URL}"
DATABASE_URL_SYNC: "${DATABASE_URL_SYNC}"
REDIS_URL: "${REDIS_URL}"
@@ -81,7 +84,7 @@ services:
LOG_LEVEL: "${LOG_LEVEL}"
LOG_JSON: "${LOG_JSON}"
expose:
- "8000"
- "${SERVER_INTERNAL_PORT}"
volumes:
- server_uploads:/app/uploads
depends_on:
@@ -97,7 +100,7 @@ services:
"CMD",
"python",
"-c",
"import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/', timeout=5)",
"import urllib.request; urllib.request.urlopen('http://127.0.0.1:${SERVER_INTERNAL_PORT}/', timeout=5)",
]
interval: 15s
timeout: 10s
@@ -111,10 +114,12 @@ services:
build:
context: ./admin-web
args:
ADMIN_WEB_NODE_IMAGE: "${ADMIN_WEB_NODE_IMAGE}"
ADMIN_WEB_NGINX_IMAGE: "${ADMIN_WEB_NGINX_IMAGE}"
VITE_API_BASE: "${VITE_API_BASE}"
container_name: ciyuan-admin-web
expose:
- "80"
- "${ADMIN_WEB_INTERNAL_PORT}"
depends_on:
server:
condition: service_healthy
@@ -125,9 +130,16 @@ services:
clients:
build:
context: ./clients
args:
CLIENTS_NODE_IMAGE: "${CLIENTS_NODE_IMAGE}"
CLIENTS_NGINX_IMAGE: "${CLIENTS_NGINX_IMAGE}"
VITE_CLIENT_H5_API_BASE: "${VITE_CLIENT_H5_API_BASE}"
VITE_CLIENT_H5_SERVER_ORIGIN: "${VITE_CLIENT_H5_SERVER_ORIGIN}"
VITE_CLIENT_NATIVE_API_BASE: "${VITE_CLIENT_NATIVE_API_BASE}"
VITE_CLIENT_NATIVE_SERVER_ORIGIN: "${VITE_CLIENT_NATIVE_SERVER_ORIGIN}"
container_name: ciyuan-clients
expose:
- "80"
- "${CLIENTS_INTERNAL_PORT}"
depends_on:
server:
condition: service_healthy
@@ -138,11 +150,19 @@ services:
nginx:
image: "${NGINX_IMAGE}"
container_name: ciyuan-nginx
environment:
NGINX_CLIENT_INTERNAL_PORT: "${NGINX_CLIENT_INTERNAL_PORT}"
NGINX_ADMIN_INTERNAL_PORT: "${NGINX_ADMIN_INTERNAL_PORT}"
NGINX_SERVER_INTERNAL_PORT: "${NGINX_SERVER_INTERNAL_PORT}"
SERVER_INTERNAL_PORT: "${SERVER_INTERNAL_PORT}"
CLIENTS_INTERNAL_PORT: "${CLIENTS_INTERNAL_PORT}"
ADMIN_WEB_INTERNAL_PORT: "${ADMIN_WEB_INTERNAL_PORT}"
ports:
- "${CLIENT_WEB_PORT}:80"
- "${ADMIN_WEB_PORT}:81"
- "${CLIENT_WEB_PORT}:${NGINX_CLIENT_INTERNAL_PORT}"
- "${ADMIN_WEB_PORT}:${NGINX_ADMIN_INTERNAL_PORT}"
- "${SERVER_WEB_PORT}:${NGINX_SERVER_INTERNAL_PORT}"
volumes:
- ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
- ./docker/nginx/default.conf:/etc/nginx/templates/default.conf.template:ro
depends_on:
server:
condition: service_healthy