From e16524d574fb45c2f96feaf69ad6ad3b3ea37cee Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Wed, 25 Jun 2025 10:29:49 +0800 Subject: [PATCH] build: reuse v1.0.1 image. --- installer/Dockerfile | 3 ++- installer/Dockerfile-vector-model | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/installer/Dockerfile b/installer/Dockerfile index 3f905e5a0..88f02292c 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir -p /opt/maxkb-app /opt/maxkb-app/model && \ rm -rf /opt/maxkb-app/ui COPY --from=web-build ui /opt/maxkb-app/ui -COPY --from=vector-model /opt/maxkb-app/model /opt/maxkb-app/model + WORKDIR /opt/maxkb-app RUN python3 -m venv /opt/py3 && \ pip install poetry==1.8.5 --break-system-packages && \ @@ -65,6 +65,7 @@ ENV MAXKB_VERSION="${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_C WORKDIR /opt/maxkb-app COPY --from=stage-build /opt/maxkb-app /opt/maxkb-app COPY --from=stage-build /opt/py3 /opt/py3 +COPY --from=vector-model /opt/maxkb-app/model /opt/maxkb-app/model RUN chmod 755 /tmp && \ find /opt/maxkb-app -mindepth 1 -not -name 'sandbox' -exec chmod 700 {} + && \ diff --git a/installer/Dockerfile-vector-model b/installer/Dockerfile-vector-model index 2dc10be1d..52b062a90 100644 --- a/installer/Dockerfile-vector-model +++ b/installer/Dockerfile-vector-model @@ -11,6 +11,11 @@ # 不知道为什么用上面的脚本重新拉一遍向量模型比之前的大很多，所以还是用下面的脚本复用原来已经构建好的向量模型 FROM ghcr.io/1panel-dev/maxkb-vector-model:v1.0.1 AS vector-model -FROM scratch + +FROM alpine AS tmp-stage COPY --from=vector-model /opt/maxkb/app/model /opt/maxkb-app/model -COPY --from=vector-model /opt/maxkb/app/model/base/hub /opt/maxkb-app/model/tokenizer \ No newline at end of file +COPY --from=vector-model /opt/maxkb/app/model/base/hub /opt/maxkb-app/model/tokenizer +RUN rm -rf /opt/maxkb-app/model/embedding/shibing624_text2vec-base-chinese/onnx + +FROM scratch +COPY --from=tmp-stage /opt/maxkb-app/model /opt/maxkb-app/model \ No newline at end of file