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