Merge branch 'master' of https://gitea.anxinyun.cn/zhouxin/ReportCenter

jenkinsfile_poms_web

@@ -6,13 +6,12 @@ pipeline {
     }
     
     stages {
-        stage('Testing pep-report-web ......') {
+        stage('Testing datacenter-web ......') {
             steps {
-                sh 'switch-auth.sh  anxinyun' 
-                buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
-                buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
-                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./web' 
-                sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
+                buildName "#${BUILD_NUMBER}  ~/pep/${JOB_NAME}:${IMAGE_VERSION}"
+                buildDescription "harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}"
+                sh 'nerdctl build -t harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION} ./web' 
+                sh 'nerdctl push harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}' 
             }
         }
     }

web/Dockerfile

@@ -27,14 +27,19 @@
 # 旧版本构建方式
 
 
-FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
-
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
 COPY . /var/app
-
 WORKDIR /var/app
-
 EXPOSE 8080
-
-CMD ["-u", "http://localhost:8088"]
-
-ENTRYPOINT [ "node", "server.js" ]
+RUN npm config set registry=http://10.8.30.22:7000
+RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
+RUN npm cache clean -f
+RUN npm install --registry http://10.8.30.22:7000
+RUN npm run build
+RUN rm  -rf client/src
+RUN rm  -rf node_modules
+RUN npm install --production --force --registry http://10.8.30.22:7000
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
+COPY --from=builder --chown=node /var/app  /home/node/app
+WORKDIR /home/node/app
+CMD ["node", "server.js"]