From 008fe29de8c8630b7db5abd304b2f7c07277361d Mon Sep 17 00:00:00 2001 From: yetone Date: Thu, 20 Mar 2025 03:45:44 +0800 Subject: [PATCH] fix: use host network for rag service container (#1649) --- Makefile | 2 +- lua/avante/rag_service.lua | 5 ++--- py/rag-service/Dockerfile | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f9be9a8..8212c57 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ BUILD_DIR := build BUILD_FROM_SOURCE ?= false TARGET_LIBRARY ?= all -RAG_SERVICE_VERSION ?= 0.0.8 +RAG_SERVICE_VERSION ?= 0.0.9 RAG_SERVICE_IMAGE := quay.io/yetoneful/avante-rag-service:$(RAG_SERVICE_VERSION) all: luajit diff --git a/lua/avante/rag_service.lua b/lua/avante/rag_service.lua index c3dee61..ad24c11 100644 --- a/lua/avante/rag_service.lua +++ b/lua/avante/rag_service.lua @@ -8,7 +8,7 @@ local M = {} local container_name = "avante-rag-service" local service_path = "/tmp/" .. container_name -function M.get_rag_service_image() return "quay.io/yetoneful/avante-rag-service:0.0.8" end +function M.get_rag_service_image() return "quay.io/yetoneful/avante-rag-service:0.0.9" end function M.get_rag_service_port() return 20250 end @@ -74,8 +74,7 @@ function M.launch_rag_service(cb) M.stop_rag_service() end local cmd_ = string.format( - "docker run -d -p %d:8000 --name %s -v %s:/data -v %s:/host:ro -e ALLOW_RESET=TRUE -e DATA_DIR=/data -e RAG_PROVIDER=%s -e %s_API_KEY=%s -e %s_API_BASE=%s -e RAG_LLM_MODEL=%s -e RAG_EMBED_MODEL=%s %s %s", - port, + "docker run -d --network=host --name %s -v %s:/data -v %s:/host:ro -e ALLOW_RESET=TRUE -e DATA_DIR=/data -e RAG_PROVIDER=%s -e %s_API_KEY=%s -e %s_API_BASE=%s -e RAG_LLM_MODEL=%s -e RAG_EMBED_MODEL=%s %s %s", container_name, data_path, Config.rag_service.host_mount, diff --git a/py/rag-service/Dockerfile b/py/rag-service/Dockerfile index 665733d..d46b707 100644 --- a/py/rag-service/Dockerfile +++ b/py/rag-service/Dockerfile @@ -15,11 +15,8 @@ RUN uv venv RUN uv pip install -r requirements.txt ENV PYTHONUNBUFFERED=1 \ - PYTHONDONTWRITEBYTECODE=1 \ - PORT=8000 - -EXPOSE ${PORT} + PYTHONDONTWRITEBYTECODE=1 COPY . . -CMD ["uv", "run", "fastapi", "run", "src/main.py", "--workers", "3"] +CMD ["uv", "run", "fastapi", "run", "src/main.py", "--workers", "3", "--port", "20250"]