From d053ba81ed760dd65ea33aa8c1b447281ba8d800 Mon Sep 17 00:00:00 2001 From: fatedier Date: Fri, 20 Mar 2026 14:16:02 +0800 Subject: [PATCH] Merge pull request #5250 from fatedier/new docker: copy shared web directory for npm workspace builds --- dockerfiles/Dockerfile-for-frpc | 7 +++++-- dockerfiles/Dockerfile-for-frps | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dockerfiles/Dockerfile-for-frpc b/dockerfiles/Dockerfile-for-frpc index 881b0cc2..6760bb16 100644 --- a/dockerfiles/Dockerfile-for-frpc +++ b/dockerfiles/Dockerfile-for-frpc @@ -1,8 +1,11 @@ FROM node:22 AS web-builder -WORKDIR /web/frpc -COPY web/frpc/ ./ +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 FROM golang:1.25 AS building diff --git a/dockerfiles/Dockerfile-for-frps b/dockerfiles/Dockerfile-for-frps index 3df253e2..8ef7dff4 100644 --- a/dockerfiles/Dockerfile-for-frps +++ b/dockerfiles/Dockerfile-for-frps @@ -1,8 +1,11 @@ FROM node:22 AS web-builder -WORKDIR /web/frps -COPY web/frps/ ./ +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 FROM golang:1.25 AS building