diff --git a/jenkinsfilenew_web-network b/jenkinsfilenew_web-network new file mode 100644 index 0000000..f52a409 --- /dev/null +++ b/jenkinsfilenew_web-network @@ -0,0 +1,25 @@ +podTemplate { + node('pod-templ-jenkins-slave-common') { + + env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${IOT}/${JOB_NAME}" + env.IMAGE_NAME_SHORT = "${IOT}/${JOB_NAME}" + env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/OperationalService.git" + + stage('Run shell') { + git branch: 'dev', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" + + container('image-builder') { + sh''' + pwd + ls -al + + /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web-network/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup + + ''' + } + + buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" + buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" + } + } +} diff --git a/web-network/Dockerfilenew b/web-network/Dockerfilenew index c3597fa..32308d8 100644 --- a/web-network/Dockerfilenew +++ b/web-network/Dockerfilenew @@ -1,31 +1,20 @@ FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder -COPY ./web/ /var/app - WORKDIR /var/app -EXPOSE 8080 +COPY ./web-network/ /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 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:12 - -COPY --from=builder --chown=node /var/app /home/node/app - +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 +CMD ["node", "server.js"] \ No newline at end of file