YueHuihui
/
RAGflow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(docker): 修改readme.md，修复若干管理系统页面bug (#14)

This commit is contained in:
zstar 2025-04-06 00:54:39 +08:00 committed by GitHub
parent 5e1039694e
commit da80ea76b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 110 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
.github/workflows/tests.yml vendored
View File

@ -53,101 +53,101 @@ jobs:
version: ">=0.8.2" version: ">=0.8.2"
args: "check" args: "check"
# - name: Build ragflow:nightly-slim - name: Build ragflow:nightly-slim
# run: | run: |
# RUNNER_WORKSPACE_PREFIX=${RUNNER_WORKSPACE_PREFIX:-$HOME} RUNNER_WORKSPACE_PREFIX=${RUNNER_WORKSPACE_PREFIX:-$HOME}
# sudo docker pull ubuntu:22.04 sudo docker pull ubuntu:22.04
# sudo docker build --progress=plain --build-arg LIGHTEN=1 --build-arg NEED_MIRROR=1 -f Dockerfile -t infiniflow/ragflow:nightly-slim . sudo docker build --progress=plain --build-arg LIGHTEN=1 --build-arg NEED_MIRROR=1 -f Dockerfile -t infiniflow/ragflow:nightly-slim .
# - name: Build ragflow:nightly - name: Build ragflow:nightly
# run: | run: |
# sudo docker build --progress=plain --build-arg NEED_MIRROR=1 -f Dockerfile -t infiniflow/ragflow:nightly . sudo docker build --progress=plain --build-arg NEED_MIRROR=1 -f Dockerfile -t infiniflow/ragflow:nightly .
# - name: Start ragflow:nightly-slim - name: Start ragflow:nightly-slim
# run: | run: |
# echo -e "\nRAGFLOW_IMAGE=infiniflow/ragflow:nightly-slim" >> docker/.env echo -e "\nRAGFLOW_IMAGE=infiniflow/ragflow:nightly-slim" >> docker/.env
# sudo docker compose -f docker/docker-compose.yml up -d sudo docker compose -f docker/docker-compose.yml up -d
# - name: Stop ragflow:nightly-slim - name: Stop ragflow:nightly-slim
# if: always() # always run this step even if previous steps failed if: always() # always run this step even if previous steps failed
# run: | run: |
# sudo docker compose -f docker/docker-compose.yml down -v sudo docker compose -f docker/docker-compose.yml down -v
# - name: Start ragflow:nightly - name: Start ragflow:nightly
# run: | run: |
# echo -e "\nRAGFLOW_IMAGE=infiniflow/ragflow:nightly" >> docker/.env echo -e "\nRAGFLOW_IMAGE=infiniflow/ragflow:nightly" >> docker/.env
# sudo docker compose -f docker/docker-compose.yml up -d sudo docker compose -f docker/docker-compose.yml up -d
# - name: Run sdk tests against Elasticsearch - name: Run sdk tests against Elasticsearch
# run: | run: |
# export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY="" export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
# export HOST_ADDRESS=http://host.docker.internal:9380 export HOST_ADDRESS=http://host.docker.internal:9380
# until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do
# echo "Waiting for service to be available..." echo "Waiting for service to be available..."
# sleep 5 sleep 5
# done done
# cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_sdk_api && pytest -s --tb=short get_email.py t_dataset.py t_chat.py t_session.py t_document.py t_chunk.py cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_sdk_api && pytest -s --tb=short get_email.py t_dataset.py t_chat.py t_session.py t_document.py t_chunk.py
# - name: Run frontend api tests against Elasticsearch - name: Run frontend api tests against Elasticsearch
# run: | run: |
# export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY="" export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
# export HOST_ADDRESS=http://host.docker.internal:9380 export HOST_ADDRESS=http://host.docker.internal:9380
# until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do
# echo "Waiting for service to be available..." echo "Waiting for service to be available..."
# sleep 5 sleep 5
# done done
# cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_frontend_api && pytest -s --tb=short get_email.py test_dataset.py cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_frontend_api && pytest -s --tb=short get_email.py test_dataset.py
# - name: Run http api tests against Elasticsearch - name: Run http api tests against Elasticsearch
# run: | run: |
# export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY="" export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
# export HOST_ADDRESS=http://host.docker.internal:9380 export HOST_ADDRESS=http://host.docker.internal:9380
# until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do
# echo "Waiting for service to be available..." echo "Waiting for service to be available..."
# sleep 5 sleep 5
# done done
# cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_http_api && pytest -s --tb=short -m "not slow" cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_http_api && pytest -s --tb=short -m "not slow"
# - name: Stop ragflow:nightly - name: Stop ragflow:nightly
# if: always() # always run this step even if previous steps failed if: always() # always run this step even if previous steps failed
# run: | run: |
# sudo docker compose -f docker/docker-compose.yml down -v sudo docker compose -f docker/docker-compose.yml down -v
# - name: Start ragflow:nightly - name: Start ragflow:nightly
# run: | run: |
# sudo DOC_ENGINE=infinity docker compose -f docker/docker-compose.yml up -d sudo DOC_ENGINE=infinity docker compose -f docker/docker-compose.yml up -d
# - name: Run sdk tests against Infinity - name: Run sdk tests against Infinity
# run: | run: |
# export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY="" export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
# export HOST_ADDRESS=http://host.docker.internal:9380 export HOST_ADDRESS=http://host.docker.internal:9380
# until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do
# echo "Waiting for service to be available..." echo "Waiting for service to be available..."
# sleep 5 sleep 5
# done done
# cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_sdk_api && pytest -s --tb=short get_email.py t_dataset.py t_chat.py t_session.py t_document.py t_chunk.py cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_sdk_api && pytest -s --tb=short get_email.py t_dataset.py t_chat.py t_session.py t_document.py t_chunk.py
# - name: Run frontend api tests against Infinity - name: Run frontend api tests against Infinity
# run: | run: |
# export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY="" export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
# export HOST_ADDRESS=http://host.docker.internal:9380 export HOST_ADDRESS=http://host.docker.internal:9380
# until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do
# echo "Waiting for service to be available..." echo "Waiting for service to be available..."
# sleep 5 sleep 5
# done done
# cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_frontend_api && pytest -s --tb=short get_email.py test_dataset.py cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_frontend_api && pytest -s --tb=short get_email.py test_dataset.py
# - name: Run http api tests against Infinity - name: Run http api tests against Infinity
# run: | run: |
# export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY="" export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
# export HOST_ADDRESS=http://host.docker.internal:9380 export HOST_ADDRESS=http://host.docker.internal:9380
# until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do until sudo docker exec ragflow-server curl -s --connect-timeout 5 ${HOST_ADDRESS} > /dev/null; do
# echo "Waiting for service to be available..." echo "Waiting for service to be available..."
# sleep 5 sleep 5
# done done
# cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_http_api && DOC_ENGINE=infinity pytest -s --tb=short -m "not slow" cd sdk/python && uv sync --python 3.10 --frozen && uv pip install . && source .venv/bin/activate && cd test/test_http_api && DOC_ENGINE=infinity pytest -s --tb=short -m "not slow"
# - name: Stop ragflow:nightly - name: Stop ragflow:nightly
# if: always() # always run this step even if previous steps failed if: always() # always run this step even if previous steps failed
# run: | run: |
# sudo DOC_ENGINE=infinity docker compose -f docker/docker-compose.yml down -v sudo DOC_ENGINE=infinity docker compose -f docker/docker-compose.yml down -v

33
docker/docker-compose-CN-oc9.yml
View File

@ -1,33 +0,0 @@
# The RAGFlow team do not actively maintain docker-compose-CN-oc9.yml, so use them at your own risk.
# However, you are welcome to file a pull request to improve it.
include:
- ./docker-compose-base.yml
services:
ragflow:
depends_on:
mysql:
condition: service_healthy
image: edwardelric233/ragflow:oc9
container_name: ragflow-server
ports:
- ${SVR_HTTP_PORT}:9380
- 80:80
- 443:443
volumes:
- ./ragflow-logs:/ragflow/logs
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
env_file: .env
environment:
- TZ=${TIMEZONE}
- HF_ENDPOINT=${HF_ENDPOINT}
- MACOS=${MACOS}
networks:
- ragflow
restart: on-failure
# https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
# If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container.
extra_hosts:
- "host.docker.internal:host-gateway"

40
docker/docker-compose-gpu-CN-oc9.yml
View File

@ -1,40 +0,0 @@
# The RAGFlow team do not actively maintain docker-compose-gpu-CN-oc9.yml, so use them at your own risk.
# However, you are welcome to file a pull request to improve it.
include:
- ./docker-compose-base.yml
services:
ragflow:
depends_on:
mysql:
condition: service_healthy
image: edwardelric233/ragflow:oc9
container_name: ragflow-server
ports:
- ${SVR_HTTP_PORT}:9380
- 80:80
- 443:443
volumes:
- ./ragflow-logs:/ragflow/logs
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
env_file: .env
environment:
- TZ=${TIMEZONE}
- HF_ENDPOINT=${HF_ENDPOINT}
- MACOS=${MACOS}
networks:
- ragflow
restart: on-failure
# https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
# If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container.
extra_hosts:
- "host.docker.internal:host-gateway"
deploy:
resources:
reservations:
devices:
- driver: nvidia
count: all
capabilities: [gpu]

40
docker/docker-compose-gpu.yml
View File

@ -1,40 +0,0 @@
# The RAGFlow team do not actively maintain docker-compose-gpu.yml, so use them at your own risk.
# Pull requests to improve it are welcome.
include:
- ./docker-compose-base.yml
services:
ragflow:
depends_on:
mysql:
condition: service_healthy
image: ${RAGFLOW_IMAGE}
container_name: ragflow-server
ports:
- ${SVR_HTTP_PORT}:9380
- 80:80
- 443:443
volumes:
- ./ragflow-logs:/ragflow/logs
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
env_file: .env
environment:
- TZ=${TIMEZONE}
- HF_ENDPOINT=${HF_ENDPOINT}
- MACOS=${MACOS}
networks:
- ragflow
restart: on-failure
# https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
# If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container.
extra_hosts:
- "host.docker.internal:host-gateway"
deploy:
resources:
reservations:
devices:
- driver: nvidia
count: all
capabilities: [gpu]

56
docker/docker-compose-macos.yml
View File

@ -1,56 +0,0 @@
include:
- ./docker-compose-base.yml
services:
ragflow:
depends_on:
mysql:
condition: service_healthy
build:
context: ../
dockerfile: Dockerfile
container_name: ragflow-server
ports:
- ${SVR_HTTP_PORT}:9380
- 80:80
- 443:443
volumes:
- ./ragflow-logs:/ragflow/logs
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
env_file: .env
environment:
- TZ=${TIMEZONE}
- HF_ENDPOINT=${HF_ENDPOINT}
- MACOS=${MACOS:-1}
- LIGHTEN=${LIGHTEN:-1}
networks:
- ragflow
restart: on-failure
# https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
# If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container.
extra_hosts:
- "host.docker.internal:host-gateway"
# executor:
# depends_on:
# mysql:
# condition: service_healthy
# image: ${RAGFLOW_IMAGE}
# container_name: ragflow-executor
# volumes:
# - ./ragflow-logs:/ragflow/logs
# - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
# env_file: .env
# environment:
# - TZ=${TIMEZONE}
# - HF_ENDPOINT=${HF_ENDPOINT}
# - MACOS=${MACOS}
# entrypoint: "/ragflow/entrypoint_task_executor.sh 1 3"
# networks:
# - ragflow
# restart: on-failure
# # https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
# # If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container.
# extra_hosts:
# - "host.docker.internal:host-gateway"

45
docker/docker-compose.yml
View File

@ -29,25 +29,26 @@ services:
# If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container. # If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container.
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
# executor:
# depends_on: management-frontend:
# mysql: image: zstar1003/ragflowplus-management-web:v0.1.1
# condition: service_healthy ports:
# image: ${RAGFLOW_IMAGE} - "8080:80"
# container_name: ragflow-executor depends_on:
# volumes: - management-backend
# - ./ragflow-logs:/ragflow/logs environment:
# - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf - API_URL=http://management-backend:5000
# env_file: .env networks:
# environment: - ragflow
# - TZ=${TIMEZONE}
# - HF_ENDPOINT=${HF_ENDPOINT} management-backend:
# - MACOS=${MACOS} image: zstar1003/ragflowplus-management-server:v0.1.1
# entrypoint: "/ragflow/entrypoint_task_executor.sh 1 3" ports:
# networks: - "5000:5000"
# - ragflow environment:
# restart: on-failure - FLASK_ENV=development
# # https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration - CORS_ALLOWED_ORIGINS=http://localhost:8080,http://management-frontend
# # If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container. extra_hosts:
# extra_hosts: - "host.docker.internal:host-gateway"
# - "host.docker.internal:host-gateway" networks:
- ragflow

4
management/server/database.py
View File

@ -4,8 +4,8 @@ from datetime import datetime
# 数据库连接配置 # 数据库连接配置
db_config = { db_config = {
# "host": "host.docker.internal", 如果是在Docke容器内部访问数据库 "host": "host.docker.internal", # 如果是在Docke容器内部访问数据库
"host": "localhost", # "host": "localhost",
"port": 5455, "port": 5455,
"user": "root", "user": "root",
"password": "infini_rag_flow", "password": "infini_rag_flow",