From 9a380de887bbe1c626984bb0007bd9a9ffcfb9c5 Mon Sep 17 00:00:00 2001
From: iris_cx <cai.xiang1@free-sun.com.cn>
Date: Thu, 6 Jul 2023 02:41:26 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'web/Dockerfilenew'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/Dockerfilenew | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/web/Dockerfilenew b/web/Dockerfilenew
index b521e017..7e06d899 100644
--- a/web/Dockerfilenew
+++ b/web/Dockerfilenew
@@ -1,17 +1,35 @@
 FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
+
 COPY . /var/app
+
 WORKDIR /var/app
+
 EXPOSE 8080
+
 RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/
+
 RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
+
 RUN npm cache clean -f
+
 RUN rm -rf package-lock.json
-RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/
+
+RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/ 
+
 RUN npm run build
+
 RUN rm  -rf client/src
+
 RUN rm  -rf node_modules
-RUN npm install --production --force --registry https://nexus.ngaiot.com/repository/fs-npm/ 
-FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
-COPY --from=builder --chown=node /var/app  /home/node/app
+
+RUN npm install --production --force --registry https://nexus.ngaiot.com/repository/fs-npm/
+
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
+
+ENV LANG C.UTF-8
+
+COPY --from=builder --chown=node /var/app /home/node/app
+
 WORKDIR /home/node/app
-CMD ["node", "server.js"]
\ No newline at end of file
+
+CMD [ "node", "server.js" ]
\ No newline at end of file