From e14ebb7f99696c77ac08d2c9ce8368f45a378e54 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Mon, 20 Jun 2022 14:56:36 +0800 Subject: [PATCH] jenkinsfile --- code/api/Dockerfile | 7 +++++-- code/web/Dockerfile | 2 +- code/api/jenkinsfile => jenkinsfile_api | 4 ++-- code/web/jenkinsfile => jenkinsfile_web | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) rename code/api/jenkinsfile => jenkinsfile_api (84%) rename code/web/jenkinsfile => jenkinsfile_web (84%) diff --git a/code/api/Dockerfile b/code/api/Dockerfile index 8333d72..db8924c 100644 --- a/code/api/Dockerfile +++ b/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 diff --git a/code/web/Dockerfile b/code/web/Dockerfile index 9e6abdd..db8924c 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 repository.anxinyun.cn/devops/node:12-dev +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20 WORKDIR /app diff --git a/code/api/jenkinsfile b/jenkinsfile_api similarity index 84% rename from code/api/jenkinsfile rename to jenkinsfile_api index 130f306..1ec4b42 100644 --- a/code/api/jenkinsfile +++ b/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}' } } diff --git a/code/web/jenkinsfile b/jenkinsfile_web similarity index 84% rename from code/web/jenkinsfile rename to jenkinsfile_web index 130f306..28d2fa6 100644 --- a/code/web/jenkinsfile +++ b/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}' } }