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

api/Dockerfile

@@ -6,11 +6,11 @@ WORKDIR /var/app
 
 EXPOSE 8080
 
-RUN npm config set registry=http://10.8.30.22:7000
+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 http://10.8.30.22:7000
+# 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
 

api/Dockerfilenew

@@ -1,13 +0,0 @@
-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

@@ -3,14 +3,13 @@ podTemplate {
 		
 		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}"
 		env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}"
-        env.SVN_Add = "https://gitea.anxinyun.cn/free-sun/OperationalService.git"
 		
 	    stage('Run shell') { 
-		    checkout([$class: 'SubversionSCM', filterChangelog: false, locations: [[cancelProcessOnExternalsFail: true, credentialsId: 'svn-build', depthOption: 'infinity', ignoreExternalsOption: true, local: '.', remote: "${SVN_Add}"]], quietOperation: true, workspaceUpdater: [$class: 'UpdateUpdater']])
+		    git credentialsId: 'gitea-builder', url: 'https://gitea.anxinyun.cn/free-sun/OperationalService.git'
 		    
 		    container('image-builder') {			    
 				sh'''
-				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
 			    '''			    
 		    }
 			

jenkinsfilenew_web

@@ -0,0 +1,21 @@
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+		
+		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"
+		
+	    stage('Run shell') { 
+		    git credentialsId: 'gitea-builder', url: 'https://gitea.anxinyun.cn/free-sun/OperationalService.git'
+		    
+		    container('image-builder') {			    
+				sh'''
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+			    '''			    
+		    }
+			
+		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+		}
+	}
+}

web/Dockerfile

@@ -6,15 +6,15 @@ WORKDIR /var/app
 
 EXPOSE 8080
 
-RUN npm config set registry=http://10.8.30.22:7000
+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 http://10.8.30.22:7000
+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 --registry http://10.8.30.22:7000
+RUN npm install --production --registry https://nexus.ngaiot.com/repository/fs-npm/
 
 FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20