From 031716afd104dce6dc2cd06ecca0a76f145b744f Mon Sep 17 00:00:00 2001 From: fatedier Date: Thu, 15 Oct 2026 13:01:59 +0800 Subject: [PATCH] Merge pull request #5569 from fatedier/fix/docker-workspace-lockfile fix(docker): install web dependencies from the workspace lockfile --- dockerfiles/Dockerfile-for-frpc | 14 ++++++++------ dockerfiles/Dockerfile-for-frps | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dockerfiles/Dockerfile-for-frpc b/dockerfiles/Dockerfile-for-frpc index e83b10f0..8b1ce362 100644 --- a/dockerfiles/Dockerfile-for-frpc +++ b/dockerfiles/Dockerfile-for-frpc @@ -1,12 +1,14 @@ FROM node:22 AS web-builder -COPY web/package.json /web/package.json -COPY web/shared/ /web/shared/ -COPY web/frpc/ /web/frpc/ WORKDIR /web -RUN npm install -WORKDIR /web/frpc -RUN npm run build +COPY web/package.json web/package-lock.json ./ +COPY web/shared/package.json ./shared/package.json +COPY web/frpc/package.json ./frpc/package.json +COPY web/frps/package.json ./frps/package.json +RUN npm ci +COPY web/shared/ ./shared/ +COPY web/frpc/ ./frpc/ +RUN npm run build --workspace frpc FROM golang:1.26 AS building diff --git a/dockerfiles/Dockerfile-for-frps b/dockerfiles/Dockerfile-for-frps index c13004d3..aad51e60 100644 --- a/dockerfiles/Dockerfile-for-frps +++ b/dockerfiles/Dockerfile-for-frps @@ -1,12 +1,14 @@ FROM node:22 AS web-builder -COPY web/package.json /web/package.json -COPY web/shared/ /web/shared/ -COPY web/frps/ /web/frps/ WORKDIR /web -RUN npm install -WORKDIR /web/frps -RUN npm run build +COPY web/package.json web/package-lock.json ./ +COPY web/shared/package.json ./shared/package.json +COPY web/frpc/package.json ./frpc/package.json +COPY web/frps/package.json ./frps/package.json +RUN npm ci +COPY web/shared/ ./shared/ +COPY web/frps/ ./frps/ +RUN npm run build --workspace frps FROM golang:1.26 AS building