From 5ea26a4fefab9ae7762b5eafff023d2d76642441 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Mon, 25 Mar 2024 15:35:28 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/installer/Dockerfile b/installer/Dockerfile index 953a345b7..08fb6f17c 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -1,4 +1,10 @@ FROM ghcr.io/1panel-dev/maxkb-vector-model:v1.0.1 as vector-model +FROM node:18-bookworm-slim as web-build +COPY ui ui +RUN cd ui && \ + npm install && \ + npm run build && \ + rm -rf ./node_modules FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg15.6 as stage-build ARG DEPENDENCIES=" \ @@ -13,7 +19,7 @@ COPY . /opt/maxkb/app RUN mkdir -p /opt/maxkb/app /opt/maxkb/model /opt/maxkb/conf && \ cp -f /opt/maxkb/app/installer/config.yaml /opt/maxkb/conf && \ rm -rf /opt/maxkb/app/ui - +COPY --from=web-build ui /opt/maxkb/app/ui WORKDIR /opt/maxkb/app RUN python3 -m venv /opt/py3 && \ pip install poetry --break-system-packages && \ @@ -22,13 +28,6 @@ RUN python3 -m venv /opt/py3 && \ if [ "$(uname -m)" != "x86_64" ]; then sed -i '/^torch/d' pyproject.toml; fi && \ poetry install -FROM node:18-bookworm-slim as web-build -COPY ui ui -RUN cd ui && \ - npm install && \ - npm run build && \ - rm -rf ./node_modules - FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11-pg15.6 ARG DOCKER_IMAGE_TAG=dev \ BUILD_AT \ @@ -38,7 +37,6 @@ ENV MAXKB_VERSION ${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_CO WORKDIR /opt/maxkb/app COPY --from=stage-build /opt/maxkb /opt/maxkb COPY --from=stage-build /opt/py3 /opt/py3 -COPY --from=web-build ui /opt/maxkb/app/ui COPY --from=vector-model /opt/maxkb/app/model /opt/maxkb/app/model ENV LANG=en_US.UTF-8 \