diff --git a/README.md b/README.md index b8339ec83..2f2c6655e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Static Badge docker pull infiniflow/ragflow:v0.2.0 + alt="docker pull infiniflow/ragflow:v0.3.0"> license @@ -173,7 +173,7 @@ To build the Docker images from source: ```bash $ git clone https://github.com/infiniflow/ragflow.git $ cd ragflow/ -$ docker build -t infiniflow/ragflow:v0.2.0 . +$ docker build -t infiniflow/ragflow:v0.3.0 . $ cd ragflow/docker $ chmod +x ./entrypoint.sh $ docker compose up -d diff --git a/README_ja.md b/README_ja.md index 77942682f..61135dc7c 100644 --- a/README_ja.md +++ b/README_ja.md @@ -15,7 +15,7 @@ Static Badge docker pull infiniflow/ragflow:v0.2.0 + alt="docker pull infiniflow/ragflow:v0.3.0"> license @@ -173,7 +173,7 @@ ```bash $ git clone https://github.com/infiniflow/ragflow.git $ cd ragflow/ -$ docker build -t infiniflow/ragflow:v0.2.0 . +$ docker build -t infiniflow/ragflow:v0.3.0 . $ cd ragflow/docker $ chmod +x ./entrypoint.sh $ docker compose up -d diff --git a/README_zh.md b/README_zh.md index 455e6dfe0..000e194a9 100644 --- a/README_zh.md +++ b/README_zh.md @@ -15,7 +15,7 @@ Static Badge docker pull infiniflow/ragflow:v0.2.0 + alt="docker pull infiniflow/ragflow:v0.3.0"> license @@ -173,7 +173,7 @@ ```bash $ git clone https://github.com/infiniflow/ragflow.git $ cd ragflow/ -$ docker build -t infiniflow/ragflow:v0.2.0 . +$ docker build -t infiniflow/ragflow:v0.3.0 . $ cd ragflow/docker $ chmod +x ./entrypoint.sh $ docker compose up -d diff --git a/docker/.env b/docker/.env index 36acba8c1..bb0ec683b 100644 --- a/docker/.env +++ b/docker/.env @@ -25,6 +25,8 @@ MINIO_PASSWORD=infini_rag_flow SVR_HTTP_PORT=9380 +RAGFLOW_VERSION=v0.3.0 + TIMEZONE='Asia/Shanghai' ######## OS setup for ES ########### diff --git a/docker/docker-compose-CN.yml b/docker/docker-compose-CN.yml index 68576e515..929777580 100644 --- a/docker/docker-compose-CN.yml +++ b/docker/docker-compose-CN.yml @@ -9,7 +9,7 @@ services: condition: service_healthy es01: condition: service_healthy - image: swr.cn-north-4.myhuaweicloud.com/infiniflow/ragflow:v0.2.0 + image: swr.cn-north-4.myhuaweicloud.com/infiniflow/ragflow:${RAGFLOW_VERSION} container_name: ragflow-server ports: - ${SVR_HTTP_PORT}:9380 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1a82ec67b..490a055f5 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,9 +9,10 @@ services: condition: service_healthy es01: condition: service_healthy - image: infiniflow/ragflow:v0.2.0 + image: infiniflow/ragflow:${RAGFLOW_VERSION} container_name: ragflow-server ports: + - ${SVR_HTTP_PORT}:9380 - ${SVR_HTTP_PORT}:9380 - 80:80 - 443:443 diff --git a/docs/faq.md b/docs/faq.md index 729d0f092..7aa97fcf3 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -135,7 +135,7 @@ $ docker ps *The system displays the following if all your RAGFlow components are running properly:* ``` -5bc45806b680 infiniflow/ragflow:v0.2.0 "./entrypoint.sh" 11 hours ago Up 11 hours 0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp ragflow-server +5bc45806b680 infiniflow/ragflow:v0.3.0 "./entrypoint.sh" 11 hours ago Up 11 hours 0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp, 0.0.0.0:9380->9380/tcp, :::9380->9380/tcp ragflow-server 91220e3285dd docker.elastic.co/elasticsearch/elasticsearch:8.11.3 "/bin/tini -- /usr/l…" 11 hours ago Up 11 hours (healthy) 9300/tcp, 0.0.0.0:9200->9200/tcp, :::9200->9200/tcp ragflow-es-01 d8c86f06c56b mysql:5.7.18 "docker-entrypoint.s…" 7 days ago Up 16 seconds (healthy) 0.0.0.0:3306->3306/tcp, :::3306->3306/tcp ragflow-mysql cd29bcb254bc quay.io/minio/minio:RELEASE.2023-12-20T01-00-02Z "/usr/bin/docker-ent…" 2 weeks ago Up 11 hours 0.0.0.0:9001->9001/tcp, :::9001->9001/tcp, 0.0.0.0:9000->9000/tcp, :::9000->9000/tcp ragflow-minio @@ -209,7 +209,7 @@ This exception occurs when starting up the RAGFlow server. Try the following: 1. Prolong the sleep time: Go to **docker/entrypoint.sh**, locate line 26, and replace `sleep 60` with `sleep 280`. 2. If using Windows, ensure that the **entrypoint.sh** has LF end-lines. - 3. Go to **docker/docker-compose.yml**, add the following after line 109: + 3. Go to **docker/docker-compose.yml**, add the following: ``` ./entrypoint.sh:/ragflow/entrypoint.sh ``` @@ -232,4 +232,4 @@ This exception occurs when starting up the RAGFlow server. Try the following: 1. Ensure that the RAGFlow server can access the base URL. 2. Do not forget to append **/v1/** to **http://IP:port**: - **http://IP:port/v1/** + **http://IP:port/v1/** \ No newline at end of file diff --git a/rag/svr/task_broker.py b/rag/svr/task_broker.py index 90e4ce0a1..b54792aa9 100644 --- a/rag/svr/task_broker.py +++ b/rag/svr/task_broker.py @@ -121,7 +121,6 @@ def dispatch(): tsks.append(new_task()) bulk_insert_into_db(Task, tsks, True) - print("TSK:", len(tsks)) set_dispatching(r["id"]) except Exception as e: cron_logger.exception(e)