From 8d8b441baabfd5c140933f7324fb30a5481584ac Mon Sep 17 00:00:00 2001
From: iris_cx <cai.xiang1@free-sun.com.cn>
Date: Fri, 16 Jun 2023 07:06:21 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E7=94=A8?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/Dockerfilenew | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 api/Dockerfilenew

diff --git a/api/Dockerfilenew b/api/Dockerfilenew
new file mode 100644
index 0000000..4c5d6e7
--- /dev/null
+++ b/api/Dockerfilenew
@@ -0,0 +1,13 @@
+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/
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
+COPY --from=builder --chown=node /var/app  /home/node/app
+WORKDIR /home/node/app
+CMD ["node", "server.js"]
\ No newline at end of file

From 4b6e2b9db21689bd331ac8abfc6564e485b4363d Mon Sep 17 00:00:00 2001
From: iris_cx <cai.xiang1@free-sun.com.cn>
Date: Fri, 16 Jun 2023 07:06:46 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fapi'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jenkinsfilenew_api | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api
index 542ab8e..e60983c 100644
--- a/jenkinsfilenew_api
+++ b/jenkinsfilenew_api
@@ -11,7 +11,7 @@ podTemplate {
 		    container('image-builder') {			    
 				sh'''
 					find . -depth -name '.svn' -type d -exec rm -rf {} +
-				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
 			    '''			    
 		    }
 			

From a7eee3b058be18d4d8ca711cf68a3afdf6c8af76 Mon Sep 17 00:00:00 2001
From: iris_cx <cai.xiang1@free-sun.com.cn>
Date: Fri, 16 Jun 2023 07:12:57 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'api/Dockerfilenew'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/Dockerfilenew | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/Dockerfilenew b/api/Dockerfilenew
index 4c5d6e7..b34d491 100644
--- a/api/Dockerfilenew
+++ b/api/Dockerfilenew
@@ -5,7 +5,7 @@ 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 rm -rf package-lock.json
 RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/
 FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12
 COPY --from=builder --chown=node /var/app  /home/node/app