fix: try to fix dockerfile

This commit is contained in:
winkidney
2024-09-30 20:30:13 +08:00
parent e40ddb28cc
commit 3da858b98b
2 changed files with 8 additions and 8 deletions

View File

@@ -5,8 +5,8 @@ COPY . /app
# config nodejs
RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
RUN bash n 14
RUN npm -g install yarn
RUN bash n 18
RUN npm -g install pnpm
WORKDIR /app
RUN pip install poetry

View File

@@ -10,14 +10,14 @@
# Require: Docker (http://www.docker.io/)
# -----------------------------------------------------------------------------
# Build static yarn file
FROM node:14-buster as yarn-build
# Build static pnpm file
FROM node:18-bookworm as pnpm-build
WORKDIR pinry-spa
COPY pinry-spa/package.json pinry-spa/yarn.lock ./
RUN yarn install
COPY pinry-spa/package.json pinry-spa/pnpm-lock.yaml ./
RUN pnpm install
COPY pinry-spa .
RUN yarn build
RUN pnpm build
# Required for other database options
@@ -61,7 +61,7 @@ RUN pip install "rcssmin==1.0.6" --install-option="--without-c-extensions" \
&& pip install -r requirements.txt
# Copy from previous stages
COPY --from=yarn-build pinry-spa/dist /pinry/pinry-spa/dist
COPY --from=pnpm-build pinry-spa/dist /pinry/pinry-spa/dist
COPY --from=base /root/.local /root/.local
ENV PATH=/root/.local/bin:$PATH