From 4d6d0a55e7a91a6ffbe124fc40585797abe25b10 Mon Sep 17 00:00:00 2001 From: whyour Date: Mon, 25 Mar 2024 22:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F=20node=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/310.Dockerfile | 13 +++++++++---- docker/Dockerfile | 9 +++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docker/310.Dockerfile b/docker/310.Dockerfile index e129e541..99a0233b 100644 --- a/docker/310.Dockerfile +++ b/docker/310.Dockerfile @@ -3,11 +3,11 @@ COPY package.json .npmrc pnpm-lock.yaml /tmp/build/ RUN set -x \ && apk update \ && apk add nodejs npm git \ - && npm i -g pnpm@8.3.1 \ + && npm i -g pnpm@8.3.1 pm2 tsx \ && cd /tmp/build \ && pnpm install --prod -FROM python:3.10-alpine3.18 +FROM python:3.10-alpine ARG QL_MAINTAINER="whyour" LABEL maintainer="${QL_MAINTAINER}" @@ -23,6 +23,13 @@ ENV PNPM_HOME=/root/.local/share/pnpm \ QL_DIR=/ql \ QL_BRANCH=${QL_BRANCH} +VOLUME /ql/data + +EXPOSE 5700 + +COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/ +COPY --from=builder /usr/local/bin/. /usr/local/bin/ + RUN set -x \ && apk update -f \ && apk upgrade \ @@ -49,11 +56,9 @@ RUN set -x \ && git config --global user.email "qinglong@@users.noreply.github.com" \ && git config --global user.name "qinglong" \ && git config --global http.postBuffer 524288000 \ - && npm install -g pnpm@8.3.1 pm2 tsx \ && rm -rf /root/.pnpm-store \ && rm -rf /root/.local/share/pnpm/store \ && rm -rf /root/.cache \ - && rm -rf /root/.npm \ && ulimit -c 0 ARG SOURCE_COMMIT diff --git a/docker/Dockerfile b/docker/Dockerfile index cfda87b0..c21f1282 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,11 +3,11 @@ COPY package.json .npmrc pnpm-lock.yaml /tmp/build/ RUN set -x \ && apk update \ && apk add nodejs npm git \ - && npm i -g pnpm@8.3.1 \ + && npm i -g pnpm@8.3.1 pm2 tsx \ && cd /tmp/build \ && pnpm install --prod -FROM python:3.11-alpine3.18 +FROM python:3.11-alpine ARG QL_MAINTAINER="whyour" LABEL maintainer="${QL_MAINTAINER}" @@ -27,6 +27,9 @@ VOLUME /ql/data EXPOSE 5700 +COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/ +COPY --from=builder /usr/local/bin/. /usr/local/bin/ + RUN set -x \ && apk update -f \ && apk upgrade \ @@ -53,11 +56,9 @@ RUN set -x \ && git config --global user.email "qinglong@@users.noreply.github.com" \ && git config --global user.name "qinglong" \ && git config --global http.postBuffer 524288000 \ - && npm install -g pnpm@8.3.1 pm2 tsx \ && rm -rf /root/.pnpm-store \ && rm -rf /root/.local/share/pnpm/store \ && rm -rf /root/.cache \ - && rm -rf /root/.npm \ && ulimit -c 0 ARG SOURCE_COMMIT