From 9c8ea37c94602721a486cceab0c8669bfcb5b2cf Mon Sep 17 00:00:00 2001 From: wenlele Date: Wed, 19 Jul 2023 21:00:56 +0800 Subject: [PATCH] Dockerfilenew --- Dockerfilenew-api | 13 +++++++++++++ Dockerfilenew-web | 17 +++++++++++++++++ jenkinsfilenew_api | 2 +- jenkinsfilenew_web | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 Dockerfilenew-api create mode 100644 Dockerfilenew-web diff --git a/Dockerfilenew-api b/Dockerfilenew-api new file mode 100644 index 0000000..36d624a --- /dev/null +++ b/Dockerfilenew-api @@ -0,0 +1,13 @@ +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder +COPY ./code/VideoAccess-VCMP/api/ /var/app +WORKDIR /var/app +EXPOSE 8080 +RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/ +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 https://nexus.ngaiot.com/repository/fs-npm/ +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 +COPY --from=builder --chown=node /var/app /home/node/app +WORKDIR /home/node/app +CMD ["node", "server.js"] diff --git a/Dockerfilenew-web b/Dockerfilenew-web new file mode 100644 index 0000000..0307eaa --- /dev/null +++ b/Dockerfilenew-web @@ -0,0 +1,17 @@ +FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder +COPY ./code/VideoAccess-VCMP/web/ /var/app +WORKDIR /var/app +EXPOSE 8080 +RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/ +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 https://nexus.ngaiot.com/repository/fs-npm/ +RUN npm run build +RUN rm -rf client/src +RUN rm -rf node_modules +RUN npm install --production --registry https://nexus.ngaiot.com/repository/fs-npm/ +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"] \ No newline at end of file diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api index 159cbc5..240092b 100644 --- a/jenkinsfilenew_api +++ b/jenkinsfilenew_api @@ -35,7 +35,7 @@ podTemplate { pwd ls -al - /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./Dockerfilenew-api --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' } diff --git a/jenkinsfilenew_web b/jenkinsfilenew_web index ecf52ae..b96e633 100644 --- a/jenkinsfilenew_web +++ b/jenkinsfilenew_web @@ -36,7 +36,7 @@ podTemplate { pwd ls -al - /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./code/VideoAccess-VCMP/web/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./Dockerfilenew-web --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup ''' }