From 87e75262ddbf012574aa13083889a6514d244a45 Mon Sep 17 00:00:00 2001
From: admin <admin@viaeon.com>
Date: Mon, 20 Apr 2026 12:03:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Docker=20=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=89=8D=E7=AB=AF=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 Dockerfile 中多余的前端复制命令
- 修改 workflow 将前端输出复制到 server/resource/build 目录
---
 .github/workflows/build-docker-image.yml | 3 ++-
 Dockerfile                               | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 380c9b903..b14f5ea02 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -50,7 +50,8 @@ jobs:
           npm install --global yarn
           yarn --frozen-lockfile --prefer-offline || yarn
           node --max-old-space-size=4096 ./node_modules/.bin/vite build
-          cp -r dist ../server/resource/
+          mkdir -p ../server/resource/build
+          cp -r dist/* ../server/resource/build/
 
       - name: Get version
         id: version
diff --git a/Dockerfile b/Dockerfile
index c68da3d04..c188a0eb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,6 @@ RUN #apk add upx
 RUN go mod tidy
 RUN sh get_arch.sh
 RUN echo "Hello, my CPU architecture is $(uname -m)"
-RUN cp -r /app/web/build /app/server/resource/
 RUN go env;CGO_ENABLED=0 GOOS=linux GOARCH=$ARCH go build -ldflags '-s -w' -o next-terminal main.go
 RUN #upx next-terminal