Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

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"]

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 
 			    '''			    
 		    }