Pārlūkot izejas kodu

Merge branch 'develop' into zwq

pull/15/head
朱文强 pirms 2 gadiem
vecāks
revīzija
6e18a42c03
3 mainītis faili ar 5 papildinājumiem un 6 dzēšanām
  1. +3
    -3
      .drone.yml
  2. +1
    -3
      Dockerfile
  3. +1
    -0
      package.json

+ 3
- 3
.drone.yml Parādīt failu

@@ -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



+ 1
- 3
Dockerfile Parādīt failu

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



+ 1
- 0
package.json Parādīt failu

@@ -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",


Notiek ielāde…
Atcelt
Saglabāt