fix: 支持生产环境外部数据库 6.6.6.66,移除本地 PostgreSQL 容器

This commit is contained in:
爽哒哒
2026-03-19 00:51:05 +08:00
parent ba48894378
commit 8ca161f8b0
2 changed files with 7 additions and 34 deletions

View File

@@ -108,7 +108,7 @@ DATABASES = {
#从环境变量获取数据库配置 (Docker 环境会自动注入这些变量。 #从环境变量获取数据库配置 (Docker 环境会自动注入这些变量。
# 只有当 DB_HOST 被明确设置且不为空时才使用 PostgreSQL # 只有当 DB_HOST 被明确设置且不为空时才使用 PostgreSQL
DB_HOST = os.environ.get('DB_HOST', '') DB_HOST = os.environ.get('DB_HOST', '')
if DB_HOST and DB_HOST != '6.6.6.66': if DB_HOST:
DATABASES['default'] = { DATABASES['default'] = {
'ENGINE': 'django.db.backends.postgresql', 'ENGINE': 'django.db.backends.postgresql',
'NAME': os.environ.get('DB_NAME', 'market'), 'NAME': os.environ.get('DB_NAME', 'market'),

View File

@@ -1,28 +1,7 @@
version: '3.8' version: '3.8'
services: services:
# PostgreSQL 数据库 # 后端服务 (使用外部数据库,不需要 PostgreSQL 容器)
scoring-db:
image: postgres:15-alpine
container_name: cywl-scoring-db
restart: always
environment:
- POSTGRES_DB=scoring_system
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=password
volumes:
- scoring_db_data:/var/lib/postgresql/data
ports:
- "5432:5432"
networks:
- scoring_network
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 10s
timeout: 5s
retries: 5
# 后端服务
scoring-backend: scoring-backend:
build: build:
context: ./backend context: ./backend
@@ -37,11 +16,11 @@ services:
environment: environment:
- DEBUG=False - DEBUG=False
- SECRET_KEY=${SECRET_KEY:-your-secret-key-change-this} - SECRET_KEY=${SECRET_KEY:-your-secret-key-change-this}
- DB_NAME=scoring_system - DB_NAME=${DB_NAME:-market}
- DB_USER=postgres - DB_USER=${DB_USER:-market}
- DB_PASSWORD=password - DB_PASSWORD=${DB_PASSWORD:-123market}
- DB_HOST=scoring-db - DB_HOST=${DB_HOST:-6.6.6.66}
- DB_PORT=5432 - DB_PORT=${DB_PORT:-5432}
- WECHAT_APPID=${WECHAT_APPID} - WECHAT_APPID=${WECHAT_APPID}
- WECHAT_SECRET=${WECHAT_SECRET} - WECHAT_SECRET=${WECHAT_SECRET}
- WECHAT_MCHID=${WECHAT_MCHID} - WECHAT_MCHID=${WECHAT_MCHID}
@@ -52,9 +31,6 @@ services:
- ALIYUN_OSS_BUCKET_NAME=${ALIYUN_OSS_BUCKET_NAME} - ALIYUN_OSS_BUCKET_NAME=${ALIYUN_OSS_BUCKET_NAME}
- ALIYUN_TINGWU_APP_KEY=${ALIYUN_TINGWU_APP_KEY} - ALIYUN_TINGWU_APP_KEY=${ALIYUN_TINGWU_APP_KEY}
- DASHSCOPE_API_KEY=${DASHSCOPE_API_KEY} - DASHSCOPE_API_KEY=${DASHSCOPE_API_KEY}
depends_on:
scoring-db:
condition: service_healthy
networks: networks:
- scoring_network - scoring_network
healthcheck: healthcheck:
@@ -104,9 +80,6 @@ services:
profiles: profiles:
- ssl # 只在需要 SSL 时启动 - ssl # 只在需要 SSL 时启动
volumes:
scoring_db_data:
networks: networks:
scoring_network: scoring_network:
driver: bridge driver: bridge