diff --git a/code/web/Dockerfile b/code/web/Dockerfile index 78daea3..ec2041e 100644 --- a/code/web/Dockerfile +++ b/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 registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20 +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-12 COPY --from=builder --chown=node /var/app /home/node/app diff --git a/jenkinsfile_web b/jenkinsfile_web index 7fe4008..e5f9aa0 100644 --- a/jenkinsfile_web +++ b/jenkinsfile_web @@ -8,10 +8,10 @@ pipeline { stages { stage('Testing site......') { steps { - buildName "#${BUILD_NUMBER} ~/fs-edge/${JOB_NAME}:${IMAGE_VERSION}" - buildDescription "harbor.anxinyun.cn/edge/${JOB_NAME}:${IMAGE_VERSION}" - sh 'nerdctl build -t harbor.anxinyun.cn/edge/${JOB_NAME}:${IMAGE_VERSION} ./code/web' - sh 'nerdctl build -t harbor.anxinyun.cn/edge/${JOB_NAME}:${IMAGE_VERSION}' + buildName "#${BUILD_NUMBER} ~/iot/${JOB_NAME}:${IMAGE_VERSION}" + buildDescription "harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}" + sh 'nerdctl build -t harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION} ./code/web' + sh 'nerdctl build -t harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}' } } }