jenkinsfile

code/api/Dockerfile

@@ -9,10 +9,13 @@ EXPOSE 8080
 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 rm -rf package-lock.json
 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 --registry http://10.8.30.22:7000
 
-FROM repository.anxinyun.cn/devops/node:12-dev
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
 
 WORKDIR /app
 

code/web/Dockerfile

@@ -15,7 +15,7 @@ RUN rm  -rf client/src
 RUN rm  -rf node_modules
 RUN npm install --production --registry http://10.8.30.22:7000
 
-FROM repository.anxinyun.cn/devops/node:12-dev
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
 
 WORKDIR /app
 

code/api/jenkinsfile → jenkinsfile_api

@@ -8,10 +8,10 @@ pipeline {
     stages {
         stage('Testing iot_auth ......') {
             steps {
-                sh 'switch-auth.sh  iot_auth' 
+                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} .' 
+                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./code/api' 
                 sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
             }
         }

code/web/jenkinsfile → jenkinsfile_web

@@ -8,10 +8,10 @@ pipeline {
     stages {
         stage('Testing iot_auth ......') {
             steps {
-                sh 'switch-auth.sh  iot_auth' 
+                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} .' 
+                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./code/web' 
                 sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
             }
         }