Merge branch 'master' of https://gitea.anxinyun.cn/wenlele/PumpStation

api/Dockerfilenew

@@ -0,0 +1,14 @@
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
+COPY ./api/ /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

@@ -0,0 +1,21 @@
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+		
+		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
+		env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
+		env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/PumpStation.git"
+		
+	    stage('Run shell') { 
+		    git branch: 'master', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
+		    
+		    container('image-builder') {			    
+				sh'''
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+			    '''			    
+		    }
+			
+		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+		}
+	}
+}

jenkinsfilenew_web

@@ -0,0 +1,25 @@
+podTemplate {
+    node('pod-templ-jenkins-slave-common') {
+		
+		env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${SMARTCITY}/${JOB_NAME}"
+		env.IMAGE_NAME_SHORT = "${SMARTCITY}/${JOB_NAME}"
+        env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/PumpStation.git"
+
+	    stage('Run shell') { 
+		    git branch: 'master', credentialsId: 'gitea-builder', url: "${CODE_ADDR}"
+ 
+		    container('image-builder') {			    
+				sh'''
+					pwd
+					ls -al
+					
+				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
+
+			    '''			    
+		    }
+			
+		    buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}"
+		    buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}"			
+		}
+	}
+}

web/Dockerfilenew

@@ -0,0 +1,31 @@
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
+
+COPY ./web/ /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 run build
+
+RUN rm  -rf client/src
+
+RUN rm  -rf node_modules
+
+RUN npm install --production --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" ]