Merge branch 'develop' into zwq

This commit is contained in:
朱文强 2022-02-25 10:58:05 +08:00
commit 6e18a42c03
3 changed files with 5 additions and 6 deletions

View File

@ -12,7 +12,7 @@ steps:
- name: dockerconfig - name: dockerconfig
path: /root/.docker path: /root/.docker
commands: commands:
- docker build -t harbor.picaiba.com/mes/mes-cigs-ui ./ && docker push harbor.picaiba.com/mes/mes-cigs-ui - docker build -t harbor.picaiba.com/kszny/wms-ui:00a-1.0.0 ./ && docker push harbor.picaiba.com/kszny/wms-ui:00a-1.0.0
- name: deploy - name: deploy
image: harbor.picaiba.com/tools/kubectl:1.19.8 image: harbor.picaiba.com/tools/kubectl:1.19.8
@ -20,9 +20,9 @@ steps:
- echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts - echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
#- echo "52.74.223.119 github.com" >> /etc/hosts #- echo "52.74.223.119 github.com" >> /etc/hosts
- sleep 1 - sleep 1
- kubectl scale --replicas=0 deployment/mes-ui -n mes-cigs - kubectl scale --replicas=0 deployment/a-wms-ui -n wms
- sleep 3 - sleep 3
- kubectl scale --replicas=1 deployment/mes-ui -n mes-cigs - kubectl scale --replicas=1 deployment/a-wms-ui -n wms
depends_on: depends_on:
- build - build

View File

@ -1,9 +1,7 @@
FROM node:12 AS builder FROM node:12 AS builder
WORKDIR /app WORKDIR /app
ADD package.json /app/ ADD package.json /app/
RUN npm install \ RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install
--registry=https://registry.npm.taobao.org \
--disturl=https://npm.taobao.org/dist
ADD . /app ADD . /app
RUN npm run build:prod RUN npm run build:prod

View File

@ -66,6 +66,7 @@
"nprogress": "0.2.0", "nprogress": "0.2.0",
"outlayer": "^2.1.1", "outlayer": "^2.1.1",
"path-to-regexp": "2.4.0", "path-to-regexp": "2.4.0",
"raphael": "git+https://gitee.com/shihairong/raphael",
"screenfull": "4.2.0", "screenfull": "4.2.0",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"showdown": "1.9.0", "showdown": "1.9.0",