From 9777fedf0b5bd92b25079f6e1f0a089a015b29ba Mon Sep 17 00:00:00 2001
From: wangjun <wangjun@yhglobal.com>
Date: Tue, 19 Sep 2023 10:46:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4Dockderfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vben28/Dockerfile    | 20 ++++++++++++++------
 vben28/Dockerfile.ci | 18 ------------------
 2 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 vben28/Dockerfile.ci

diff --git a/vben28/Dockerfile b/vben28/Dockerfile
index f1c1a6d8..0ed72c92 100644
--- a/vben28/Dockerfile
+++ b/vben28/Dockerfile
@@ -1,9 +1,17 @@
-FROM nginx:1.17.3-alpine as base
-EXPOSE 80
+FROM node:16-alpine as build-stage
+WORKDIR /app
+COPY . ./
+ENV NODE_OPTIONS=--max-old-space-size=16384
+RUN npm install pnpm -g 
+RUN pnpm i 
+RUN npm run build
+
 
-COPY /_nginx/nginx.conf /etc/nginx/nginx.conf
-COPY /_nginx/env.js /etc/nginx/env.js
-COPY /_nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY /dist/ /usr/share/nginx/html
+FROM nginx:1.17.3-alpine as production-stage
+COPY --from=build-stage app/_nginx/nginx.conf /etc/nginx/nginx.conf
+COPY --from=build-stage app/_nginx/env.js /etc/nginx/env.js
+COPY --from=build-stage app/_nginx/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=build-stage app/dist/ /usr/share/nginx/html
+EXPOSE 80
 
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/vben28/Dockerfile.ci b/vben28/Dockerfile.ci
deleted file mode 100644
index 506081a8..00000000
--- a/vben28/Dockerfile.ci
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM node:16-alpine as build-stage
-WORKDIR /app
-COPY . ./
-ENV NODE_OPTIONS=--max-old-space-size=16384
-RUN npm install pnpm -g 
-RUN pnpm i 
-RUN pnpm build
-
-
-FROM nginx:1.17.3-alpine as production-stage
-COPY --from=build-stage app/_nginx/nginx.conf /etc/nginx/nginx.conf
-COPY --from=build-stage app/_nginx/env.js /etc/nginx/env.js
-COPY --from=build-stage app/_nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY --from=build-stage app/dist/ /usr/share/nginx/html
-EXPOSE 80
-
-CMD ["nginx", "-g", "daemon off;"]
-