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

jenkinsfilenew_api

@@ -3,9 +3,10 @@ podTemplate {
 		
 		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
 		env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
+		env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/OperationalService.git"
 		
 	    stage('Run shell') { 
-		    git credentialsId: 'gitea-builder', url: 'https://gitea.anxinyun.cn/free-sun/OperationalService.git'
+		    git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
 		    
 		    container('image-builder') {			    
 				sh'''

jenkinsfilenew_web

@@ -3,15 +3,18 @@ podTemplate {
 		
 		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
 		env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
-        env.GIT_Add = "${GIT_ADDRESS}/free-sun/OperationalService/src/branch/dev/web"
+        env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/OperationalService.git"
 		
 	    stage('Run shell') { 
-		    git credentialsId: 'gitea-builder', url: 'https://gitea.anxinyun.cn/free-sun/OperationalService.git'
+		    git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
 		    
 		    container('image-builder') {			    
 				sh'''
-					find . -depth -name '.svn' -type d -exec rm -rf {} +
-				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+					pwd
+					ls -al
+					
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+
 			    '''			    
 		    }
 			

web/Dockerfilenew

@@ -1,6 +1,9 @@
 FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
-COPY . /var/app
+
 WORKDIR /var/app
+
+COPY ./web/ /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