diff --git a/bulid_order.txt b/bulid_order.txt index 873d084..85cc02a 100644 --- a/bulid_order.txt +++ b/bulid_order.txt @@ -1,13 +1,14 @@ docker 镜像相关命令: + 前台镜像构建相关: -docker build -t zstar1003/ragflowplus:v0.4.2 . -docker tag zstar1003/ragflowplus:v0.4.2 zstar1003/ragflowplus:v0.4.2 -docker push zstar1003/ragflowplus:v0.4.2 +docker build -t zstar1003/ragflowplus:v0.4.3 . +docker tag zstar1003/ragflowplus:v0.4.3 zstar1003/ragflowplus:v0.4.3 +docker push zstar1003/ragflowplus:v0.4.3 后台镜像构建相关: cd management docker-compose build -docker tag zstar1003/ragflowplus-management-web:v0.4.2 zstar1003/ragflowplus-management-web:v0.4.2 -docker tag zstar1003/ragflowplus-management-server:v0.4.2 zstar1003/ragflowplus-management-server:v0.4.2 -docker push zstar1003/ragflowplus-management-web:v0.4.2 -docker push zstar1003/ragflowplus-management-server:v0.4.2 \ No newline at end of file +docker tag zstar1003/ragflowplus-management-web:v0.4.3 zstar1003/ragflowplus-management-web:v0.4.3 +docker tag zstar1003/ragflowplus-management-server:v0.4.3 zstar1003/ragflowplus-management-server:v0.4.3 +docker push zstar1003/ragflowplus-management-web:v0.4.3 +docker push zstar1003/ragflowplus-management-server:v0.4.3 \ No newline at end of file diff --git a/docker/.env b/docker/.env index aae38f9..9e06e9b 100644 --- a/docker/.env +++ b/docker/.env @@ -76,9 +76,9 @@ REDIS_PASSWORD=infini_rag_flow SVR_HTTP_PORT=9380 # RAGFLOW_IMAGE原始为infiniflow/ragflow:v0.18.0-slim -RAGFLOW_IMAGE=zstar1003/ragflowplus:v0.4.2 -RAGFLOWPLUS_MANAGEMENT_WEB_IMAGE=zstar1003/ragflowplus-management-web:v0.4.2 -RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.4.2 +RAGFLOW_IMAGE=zstar1003/ragflowplus:v0.4.3 +RAGFLOWPLUS_MANAGEMENT_WEB_IMAGE=zstar1003/ragflowplus-management-web:v0.4.3 +RAGFLOWPLUS_MANAGEMENT_SERVER_IMAGE=zstar1003/ragflowplus-management-server:v0.4.3 # The local time zone. TIMEZONE='Asia/Shanghai' diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d519d36..82db1fb 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -17,7 +17,6 @@ services: - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf - ./nginx/proxy.conf:/etc/nginx/proxy.conf - ./nginx/nginx.conf:/etc/nginx/nginx.conf - - ../api/ragflow_server.py:/ragflow/api/ragflow_server.py env_file: .env environment: - TZ=${TIMEZONE} @@ -58,10 +57,7 @@ services: volumes: - ./ragflow-plus-logs:/app/logs - ./magic-pdf.json:/root/magic-pdf.json - - ../management/server/services/knowledgebases/document_parser.py:/app/services/knowledgebases/document_parser.py - - ../management/server/services/knowledgebases/__init__.py:/app/services/knowledgebases/__init__.py - - ../management/server/services/knowledgebases/excel_parser.py:/app/services/knowledgebases/excel_parser.py - - ../management/server/services/knowledgebases/utils.py:/app/services/knowledgebases/utils.py + depends_on: mysql: condition: service_healthy diff --git a/docker/docker-compose_gpu.yml b/docker/docker-compose_gpu.yml index 73b1072..f9fee4a 100644 --- a/docker/docker-compose_gpu.yml +++ b/docker/docker-compose_gpu.yml @@ -17,7 +17,6 @@ services: - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf - ./nginx/proxy.conf:/etc/nginx/proxy.conf - ./nginx/nginx.conf:/etc/nginx/nginx.conf - - ../api/ragflow_server.py:/ragflow/api/ragflow_server.py env_file: .env environment: - TZ=${TIMEZONE} @@ -57,10 +56,6 @@ services: volumes: - ./ragflow-plus-logs:/app/logs - ./magic-pdf-gpu.json:/root/magic-pdf.json - - ../management/server/services/knowledgebases/document_parser.py:/app/services/knowledgebases/document_parser.py - - ../management/server/services/knowledgebases/__init__.py:/app/services/knowledgebases/__init__.py - - ../management/server/services/knowledgebases/excel_parser.py:/app/services/knowledgebases/excel_parser.py - - ../management/server/services/knowledgebases/utils.py:/app/services/knowledgebases/utils.py depends_on: mysql: condition: service_healthy