Skip to content

Commit 5ed0162

Browse files
committed
feat: 更新 Docker 配置,添加 Milvus 令牌支持,优化健康检查命令,移除 PostgreSQL 配置,调整环境变量,增强系统稳定性
1 parent 9a162d5 commit 5ed0162

File tree

13 files changed

+103
-556
lines changed

13 files changed

+103
-556
lines changed

docker-compose.yml

Lines changed: 31 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,25 @@ services:
2525
- NEO4J_USERNAME=${NEO4J_USERNAME:-neo4j}
2626
- NEO4J_PASSWORD=${NEO4J_PASSWORD:-0123456789}
2727
- MILVUS_URI=${MILVUS_URI:-http://milvus:19530}
28+
- MILVUS_TOKEN=${MILVUS_TOKEN:-}
2829
- MINERU_OCR_URI=${MINERU_OCR_URI:-http://mineru:30000}
2930
- PADDLEX_URI=${PADDLEX_URI:-http://paddlex-ocr:8080}
3031
- MINIO_URI=${MINIO_URI:-http://milvus-minio:9000}
31-
# PostgreSQL 配置
32-
- POSTGRES_URI=postgresql://${POSTGRES_USER:-lightrag}:${POSTGRES_PASSWORD:-lightrag}@postgres-lightrag:5432/${POSTGRES_DATABASE:-lightrag}
33-
- POSTGRES_HOST=${POSTGRES_HOST:-postgres-lightrag}
34-
- POSTGRES_PORT=${POSTGRES_PORT:-5432}
35-
- POSTGRES_DATABASE=${POSTGRES_DATABASE:-lightrag}
36-
- POSTGRES_USER=${POSTGRES_USER:-lightrag}
37-
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-lightrag}
38-
# 连接池配置
39-
- POSTGRES_MAX_CONNECTIONS=50
40-
- POSTGRES_MIN_CONNECTIONS=5
4132
- MODEL_DIR=/models
4233
- RUNNING_IN_DOCKER=true
34+
- NO_PROXY=localhost,127.0.0.1,milvus,graph,milvus-minio,milvus-etcd-dev,etcd,minio
35+
- no_proxy=localhost,127.0.0.1,milvus,graph,milvus-minio,milvus-etcd-dev,etcd,minio
4336
command: uv run uvicorn server.main:app --host 0.0.0.0 --port 5050 --reload
4437
restart: unless-stopped
4538
healthcheck:
46-
test: ["CMD-SHELL", "curl -f http://localhost:5050/health || exit 1"]
39+
test: ["CMD-SHELL", "curl -f http://localhost:5050/api/health || exit 1"]
4740
interval: 30s
4841
timeout: 15s
4942
retries: 8
5043
start_period: 180s
5144
depends_on:
52-
postgres:
53-
condition: service_healthy
45+
# postgres:
46+
# condition: service_healthy
5447
milvus:
5548
condition: service_healthy
5649
minio:
@@ -80,31 +73,31 @@ services:
8073

8174
# PostgreSQL 服务 - 基于官方推荐的 shangor/postgres-for-rag 镜像
8275
# 提供 KV store, VectorDB (pgvector) 和 GraphDB (Apache AGE) 功能
83-
postgres:
84-
image: shangor/postgres-for-rag:v1.0
85-
container_name: postgres-lightrag
86-
environment:
87-
- POSTGRES_DATABASE=${POSTGRES_DATABASE:-lightrag}
88-
- POSTGRES_USER=${POSTGRES_USER:-lightrag}
89-
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-lightrag}
90-
- POSTGRES_HOST_AUTH_METHOD=md5
91-
# 启用必要的扩展
92-
- POSTGRES_INITDB_ARGS=--auth-host=md5
93-
volumes:
94-
- ./docker/volumes/postgres/data:/var/lib/postgresql/data
95-
- ./docker/init-postgres.sh:/init-postgres.sh
96-
ports:
97-
- "5432:5432"
98-
healthcheck:
99-
test: ["CMD-SHELL", "PGPASSWORD=${POSTGRES_PASSWORD:-lightrag} psql -h localhost -U ${POSTGRES_USER:-lightrag} -d ${POSTGRES_DATABASE:-lightrag} -c \"SELECT ag_catalog.create_graph('test_ready');\" || PGPASSWORD=${POSTGRES_PASSWORD:-lightrag} psql -h localhost -U ${POSTGRES_USER:-lightrag} -d ${POSTGRES_DATABASE:-lightrag} -c 'SELECT 1'"]
100-
interval: 30s
101-
timeout: 15s
102-
retries: 15
103-
start_period: 120s
104-
networks:
105-
- app-network
106-
restart: unless-stopped
107-
command: ["bash", "/init-postgres.sh"]
76+
# postgres:
77+
# image: shangor/postgres-for-rag:v1.0
78+
# container_name: postgres-lightrag
79+
# environment:
80+
# - POSTGRES_DATABASE=${POSTGRES_DATABASE:-lightrag}
81+
# - POSTGRES_USER=${POSTGRES_USER:-lightrag}
82+
# - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-lightrag}
83+
# - POSTGRES_HOST_AUTH_METHOD=md5
84+
# # 启用必要的扩展
85+
# - POSTGRES_INITDB_ARGS=--auth-host=md5
86+
# volumes:
87+
# - ./docker/volumes/postgres/data:/var/lib/postgresql/data
88+
# - ./docker/init-postgres.sh:/init-postgres.sh
89+
# ports:
90+
# - "5432:5432"
91+
# healthcheck:
92+
# test: ["CMD-SHELL", "PGPASSWORD=${POSTGRES_PASSWORD:-lightrag} psql -h localhost -U ${POSTGRES_USER:-lightrag} -d ${POSTGRES_DATABASE:-lightrag} -c \"SELECT ag_catalog.create_graph('test_ready');\" || PGPASSWORD=${POSTGRES_PASSWORD:-lightrag} psql -h localhost -U ${POSTGRES_USER:-lightrag} -d ${POSTGRES_DATABASE:-lightrag} -c 'SELECT 1'"]
93+
# interval: 30s
94+
# timeout: 15s
95+
# retries: 15
96+
# start_period: 120s
97+
# networks:
98+
# - app-network
99+
# restart: unless-stopped
100+
# command: ["bash", "/init-postgres.sh"]
108101

109102
graph:
110103
image: neo4j:5.26

docker/api.Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ COPY ../pyproject.toml /app/pyproject.toml
2929
COPY ../.python-version /app/.python-version
3030

3131
# 安装依赖项
32+
ENV HTTP_PROXY=http://172.19.13.5:7890 \
33+
HTTPS_PROXY=http://172.19.13.5:7890 \
34+
http_proxy=http://172.19.13.5:7890 \
35+
https_proxy=http://172.19.13.5:7890
36+
3237
RUN --mount=type=cache,target=/root/.cache/uv \
3338
uv sync --no-install-project
3439

@@ -38,4 +43,7 @@ COPY ../server /app/server
3843

3944
# 同步项目
4045
RUN --mount=type=cache,target=/root/.cache/uv \
41-
uv sync
46+
uv sync
47+
48+
# 取消代理
49+
RUN unset HTTP_PROXY HTTPS_PROXY http_proxy https_proxy

0 commit comments

Comments
 (0)