Merge branch 'develop' into zwq

Merge pull request 'fix: 🐛 修正构建包安装顺序' (#14 ) from cicd into develop
Reviewed-on: #14
2022-02-25 10:58:05 +08:00 · 2022-02-23 13:23:22 +08:00 · 2022-02-23 13:22:42 +08:00 · 2022-02-23 12:47:16 +08:00 · 2022-02-23 12:46:46 +08:00 · 2022-02-23 11:42:46 +08:00
3 changed files with 5 additions and 6 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -12,7 +12,7 @@ steps:
  - name: dockerconfig
    path: /root/.docker
  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
  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 "52.74.223.119 github.com" >> /etc/hosts
  - sleep 1
-  - kubectl scale --replicas=0 deployment/mes-ui -n mes-cigs
+  - kubectl scale --replicas=0 deployment/a-wms-ui -n wms
  - sleep 3
-  - kubectl scale --replicas=1 deployment/mes-ui -n mes-cigs
+  - kubectl scale --replicas=1 deployment/a-wms-ui -n wms
  depends_on:
  - build
--- a/4
+++ b/4
@ -1,9 +1,7 @@
 FROM node:12 AS builder
 WORKDIR /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
 RUN npm run build:prod
--- a/package.json
+++ b/package.json
@ -66,6 +66,7 @@
    "nprogress": "0.2.0",
    "outlayer": "^2.1.1",
    "path-to-regexp": "2.4.0",
    "raphael": "git+https://gitee.com/shihairong/raphael",
    "screenfull": "4.2.0",
    "script-loader": "0.7.2",
    "showdown": "1.9.0",
Author	SHA1	Message	Date
朱文强	6e18a42c03	Merge branch 'develop' into zwq	2022-02-25 10:58:05 +08:00
施海荣	7c6d7b63e3	Merge pull request 'fix: 🐛 修正构建包安装顺序' (#14 ) from cicd into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #14	2022-02-23 13:23:22 +08:00
thomas	bb4f3e2c0e	fix: 🐛 修正构建包安装顺序	2022-02-23 13:22:42 +08:00
施海荣	c4e7af8fba	Merge pull request 'fix: 🏗️ 修复raphael依赖找不到问题' (#13 ) from cicd into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #13	2022-02-23 12:47:16 +08:00
thomas	0338bf1a15	fix: 🏗️ 修复raphael依赖找不到问题	2022-02-23 12:46:46 +08:00
施海荣	aa15b551fb	Merge pull request 'fix: 🐛 修正构建脚本' (#12 ) from cicd into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #12	2022-02-23 11:42:46 +08:00
thomas	5fadd533de	fix: 🐛 修正构建脚本	2022-02-23 11:40:13 +08:00