删掉site/dockerfile

Dockerfile

@@ -5,14 +5,11 @@ FROM golang:1.23 AS server_builder
 ENV APP_HOME=/code/bbs-go/server
 WORKDIR "$APP_HOME"
 
-# COPY ./server/go.mod ./
-# COPY ./server/go.sum ./
 COPY ./server ./
 RUN go env -w GOPROXY=https://goproxy.cn,direct \
     && go mod download
 RUN go mod download
 
-# COPY ./server ./
 RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go
 
 
@@ -23,20 +20,20 @@ ENV APP_HOME=/code/bbs-go/site
 WORKDIR "$APP_HOME"
 
 COPY ./site ./
-RUN npm install -g pnpm --registry=https://registry.npmmirror.com
-RUN pnpm install --registry=https://registry.npmmirror.com
+# RUN npm install -g pnpm --registry=https://registry.npmmirror.com
+# RUN pnpm install --registry=https://registry.npmmirror.com
 RUN npm install -g pnpm
 RUN pnpm install
 RUN pnpm build:docker
 
-
 # run
 FROM node:20-alpine
 
 ENV APP_HOME=/app/bbs-go
 WORKDIR "$APP_HOME"
 
 COPY --from=site_builder /code/bbs-go/site/.output ./site/.output
+COPY --from=site_builder /code/bbs-go/site/node_modules ./site/node_modules
 COPY --from=server_builder /code/bbs-go/server/bbs-go ./server/bbs-go
 COPY --from=server_builder /code/bbs-go/server/*.yaml ./server/
 COPY --from=server_builder /code/bbs-go/server/*.yml ./server/

start.sh

@@ -7,6 +7,7 @@ cd ${APP_HOME}/server
 ${APP_HOME}/server/bbs-go &
 
 # 启动 bbs-go-site
+cd ${APP_HOME}/site
 node ${APP_HOME}/site/.output/server/index.mjs &
 
 # 保持容器运行