Skip to content

Commit c3001ff

Browse files
Revert "build: optimize Dockerfile."
This reverts commit d03022f.
1 parent 3940a9f commit c3001ff

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

installer/Dockerfile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,22 @@ RUN cd ui && ls -la && if [ -d "dist" ]; then exit 0; fi && \
66
NODE_OPTIONS="--max-old-space-size=4096" npx concurrently "npm run build" "npm run build-chat" && \
77
find . -maxdepth 1 ! -name '.' ! -name 'dist' ! -name 'public' -exec rm -rf {} +
88

9-
FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.6 AS deps-build
10-
COPY --chmod=700 . /opt/maxkb-app
11-
WORKDIR /opt/maxkb-app
12-
RUN pip install uv --break-system-packages && \
13-
python -m uv pip install -r pyproject.toml && \
14-
python -m uv pip install --target=/opt/maxkb-app/sandbox/python-packages requests pymysql psycopg2-binary
15-
16-
FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.6 AS apps-build
9+
FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.6 AS stage-build
1710
COPY --chmod=700 . /opt/maxkb-app
1811
RUN apt-get update && \
1912
apt-get install -y --no-install-recommends gettext libexpat1-dev libffi-dev && \
2013
apt-get clean all && \
2114
rm -rf /var/lib/apt/lists/*
2215
WORKDIR /opt/maxkb-app
2316
RUN rm -rf /opt/maxkb-app/ui && \
24-
grep -oE '"django==[^"]+"' pyproject.toml | sed 's/"//g' | xargs -n 1 pip install && python /opt/maxkb-app/apps/manage.py compilemessages && \
17+
pip install uv --break-system-packages && \
18+
python -m uv pip install -r pyproject.toml && \
2519
find /opt/maxkb-app -depth \( -name ".git*" -o -name ".docker*" -o -name ".idea*" -o -name ".editorconfig*" -o -name ".prettierrc*" -o -name "README.md" -o -name "poetry.lock" -o -name "pyproject.toml" \) -exec rm -rf {} + && \
20+
python /opt/maxkb-app/apps/manage.py compilemessages && \
21+
export PIP_TARGET=/opt/maxkb-app/sandbox/python-packages && \
22+
python -m uv pip install --target=$PIP_TARGET requests pymysql psycopg2-binary && \
2623
rm -rf /opt/maxkb-app/installer
2724
COPY --from=web-build --chmod=700 ui /opt/maxkb-app/ui
28-
COPY --from=deps-build /opt/maxkb-app/sandbox/python-packages /opt/maxkb-app/sandbox/python-packages
2925

3026
FROM ghcr.io/1panel-dev/maxkb-base:python3.11-pg17.6
3127
ARG DOCKER_IMAGE_TAG=dev \
@@ -52,8 +48,8 @@ ENV MAXKB_VERSION="${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_C
5248

5349

5450
WORKDIR /opt/maxkb-app
55-
COPY --from=apps-build /opt/maxkb-app /opt/maxkb-app
56-
COPY --from=deps-build /opt/py3/lib/python3.11/site-packages /opt/py3/lib/python3.11/site-packages
51+
COPY --from=stage-build /opt/maxkb-app /opt/maxkb-app
52+
COPY --from=stage-build /opt/py3 /opt/py3
5753

5854
RUN chmod 755 /tmp
5955

0 commit comments

Comments
 (0)