From a347abf829c9fd42fc8e66f126824683ef99ce0a Mon Sep 17 00:00:00 2001 From: begoniezhao Date: Mon, 11 Aug 2025 16:16:21 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=AF=AD=E6=B3=95=EF=BC=8C=E6=94=B9=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=96=B9=E5=BC=8F=E5=B9=B6=E8=AE=BE=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 1 + docker/Dockerfile.docreader | 2 +- scripts/start_all.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..526c8a3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf \ No newline at end of file diff --git a/docker/Dockerfile.docreader b/docker/Dockerfile.docreader index b49ad55..b5b5065 100644 --- a/docker/Dockerfile.docreader +++ b/docker/Dockerfile.docreader @@ -56,7 +56,7 @@ COPY services/docreader/scripts/ /app/scripts/ RUN ls -la /root/.paddlex/official_models # 生成 protobuf 代码 -RUN chmod +x /app/scripts/generate_proto.sh && /app/scripts/generate_proto.sh +RUN chmod +x /app/scripts/generate_proto.sh && bash /app/scripts/generate_proto.sh # 运行阶段 FROM --platform=${PLATFORM} python:3.9-slim AS runner diff --git a/scripts/start_all.sh b/scripts/start_all.sh index 6706d7d..40475f9 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -140,7 +140,7 @@ start_ollama() { else log_info "启动Ollama服务..." export OLLAMA_HOST=0.0.0.0:11435 - ollama serve & > /dev/null 2>&1 + ollama serve > /dev/null 2>&1 & # 等待服务启动 MAX_RETRIES=30