From 8b776c32a120f806af1d16df6daf5de899b33eb0 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Mon, 12 Dec 2022 14:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/Dockerfile | 38 +++++++++++++++++++------------------- jenkinsfile_poms_api | 18 +++++++++--------- jenkinsfile_poms_web | 16 ++++++++-------- web/Dockerfile | 44 ++++++++++++++++++++++---------------------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 74ac3c3..10fc786 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,36 +1,36 @@ -# FROM repository.anxinyun.cn/devops/node:12-dev as builder +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder -# COPY . /var/app +COPY . /var/app -# WORKDIR /var/app +WORKDIR /var/app -# EXPOSE 8080 +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 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 -# FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 -# COPY --from=builder --chown=node /var/app /home/node/app +COPY --from=builder --chown=node /var/app /home/node/app -# WORKDIR /home/node/app +WORKDIR /home/node/app -# CMD ["node", "server.js"] +CMD ["node", "server.js"] # 旧版本构建方式 -FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 +# FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 -COPY . /var/app +# COPY . /var/app -WORKDIR /var/app +# WORKDIR /var/app -EXPOSE 8080 +# EXPOSE 8080 -CMD ["-u", "http://localhost:8088"] +# CMD ["-u", "http://localhost:8088"] -ENTRYPOINT [ "node", "server.js" ] \ No newline at end of file +# ENTRYPOINT [ "node", "server.js" ] \ No newline at end of file diff --git a/jenkinsfile_poms_api b/jenkinsfile_poms_api index c9291bd..cc66de8 100644 --- a/jenkinsfile_poms_api +++ b/jenkinsfile_poms_api @@ -1,19 +1,19 @@ pipeline { agent { - node{ + node{ label 'jnlp-slave' - } + } } stages { - stage('Testing poms ......') { + stage('Testing site......') { 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} ./api' - sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${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/VideoAccess-VCMP/api ' + sh 'nerdctl push harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}' + } } - } + } } \ No newline at end of file diff --git a/jenkinsfile_poms_web b/jenkinsfile_poms_web index 9d43c6e..79e5de5 100644 --- a/jenkinsfile_poms_web +++ b/jenkinsfile_poms_web @@ -2,18 +2,18 @@ pipeline { agent { node{ label 'jnlp-slave' - } + } } stages { - stage('Testing poms ......') { + stage('Testing site......') { 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} ~/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/VideoAccess-VCMP/web' + sh 'nerdctl push harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}' + } } - } + } } \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile index 3991885..0ef1cde 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,40 +1,40 @@ -# FROM repository.anxinyun.cn/devops/node:12-dev as builder +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder -# COPY . /var/app +COPY . /var/app -# WORKDIR /var/app +WORKDIR /var/app -# EXPOSE 8080 +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 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 +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 --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-16:7.22-06-20 -# COPY --from=builder --chown=node /var/app /home/node/app +COPY --from=builder --chown=node /var/app /home/node/app -# WORKDIR /home/node/app +WORKDIR /home/node/app -# CMD ["node", "server.js"] +CMD ["node", "server.js"] # 旧版本构建方式 -FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 +# FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 -COPY . /var/app +# COPY . /var/app -WORKDIR /var/app +# WORKDIR /var/app -EXPOSE 8080 +# EXPOSE 8080 -CMD ["-u", "http://localhost:8088"] +# CMD ["-u", "http://localhost:8088"] -ENTRYPOINT [ "node", "server.js" ] \ No newline at end of file +# ENTRYPOINT [ "node", "server.js" ] \ No newline at end of file