Compare commits

...

33 Commits
zjl ... master

Author SHA1 Message Date
05e9e77b6b Merge pull request '2023/8/24新增修改下架包装页面' (#31) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #31
2023-08-24 11:01:28 +08:00
ebef126a9e Merge pull request 'zjl' (#30) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #30
2023-08-11 16:03:06 +08:00
2304fe94ae Merge pull request 'zjl' (#29) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #29
2023-07-19 15:47:03 +08:00
8ceb47038d Merge pull request '工单进度' (#28) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #28
2023-07-05 16:46:16 +08:00
ea9fad130c Merge pull request '7.4修改bug' (#27) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #27
2023-07-04 09:26:12 +08:00
4956f4e0cd Merge pull request 'zjl' (#26) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #26
2023-06-30 14:01:45 +08:00
42ce5fb67c Merge pull request '6.28' (#25) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #25
2023-06-28 17:06:15 +08:00
b054cd476a Merge pull request '报表样式修改' (#24) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #24
2023-06-26 16:04:13 +08:00
dc4e1fd389 Merge pull request 'zjl' (#23) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #23
2023-06-16 16:25:06 +08:00
6d64016d57 Merge pull request '增加报表管理模块' (#22) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #22
2023-05-30 09:05:20 +08:00
1e06c04ddd Merge pull request '5.25' (#21) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #21
2023-05-25 15:16:56 +08:00
37188fe760 Merge pull request '5.24' (#20) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2023-05-24 10:37:31 +08:00
dead1e5a40 Merge pull request '5.22' (#19) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #19
2023-05-22 14:21:50 +08:00
9c6bf70008 Merge pull request '5.18' (#18) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #18
2023-05-18 11:14:36 +08:00
194b2f0e0d Merge pull request '修bug' (#17) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #17
2023-05-16 16:14:28 +08:00
34d7b8682d Merge pull request '修改bug' (#16) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #16
2023-05-15 17:25:59 +08:00
6f8f692852 Merge pull request 'zjl' (#15) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
2023-05-04 16:20:39 +08:00
c75999ea93 Merge pull request '报表模块小问题' (#14) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #14
2023-03-23 15:50:36 +08:00
76b88ed75a Merge pull request '报表模块' (#13) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #13
2023-03-23 15:40:58 +08:00
a7b39f3ce1 Merge pull request 'fix: 🐛 修正构建脚本' (#12) from cicd into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #12
2023-03-14 14:39:39 +08:00
8dc73bd098 fix: 🐛 修正构建脚本 2023-03-14 14:38:01 +08:00
523a9d9767 Merge pull request 'zjl' (#11) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #11
2023-03-14 14:15:38 +08:00
4aad193bb0 Merge pull request '工艺&设备' (#10) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #10
2023-02-23 16:56:56 +08:00
64f4251159 Merge pull request '上传dist文件' (#9) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2023-02-22 13:59:57 +08:00
8810012a03 Merge pull request 'zjl' (#8) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #8
2023-02-22 11:06:10 +08:00
c74f27cbf3 Merge pull request '构建失败,修改package-lock.json' (#7) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #7
2023-02-22 09:24:37 +08:00
a9c6dfeb0b Merge pull request '修bug&更改散点图样式' (#6) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #6
2023-02-21 16:36:44 +08:00
d775dc7371 Merge pull request '修复bug' (#5) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #5
2023-02-14 15:35:34 +08:00
d3de840af1 Merge pull request '颗粒折线图' (#4) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #4
2023-02-14 11:03:07 +08:00
6237b3a8f3 Merge pull request 'zjl' (#3) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
2023-02-13 17:25:34 +08:00
df8c022982 Merge pull request '基础报表管理样式' (#2) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #2
2023-02-08 17:23:35 +08:00
781877fca5 Merge pull request 'feat: 👷 添加自动构建功能' (#1) from cicd4tftfe into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #1
2023-02-08 08:56:40 +08:00
be198b6046 feat: 👷 添加自动构建功能 2023-02-08 08:54:17 +08:00
3 changed files with 62 additions and 0 deletions

7
.dockerignore Normal file
View File

@ -0,0 +1,7 @@
.vscode/
.idea/
node_modules/
**/*.log
LICENSE
README.md
README.en.md

41
.drone.yml Normal file
View File

@ -0,0 +1,41 @@
---
kind: pipeline
type: docker
name: default
steps:
- name: build
image: docker:dind
volumes:
- name: dockersock
path: /var/run/docker.sock
- name: dockerconfig
path: /root/.docker
commands:
- docker build -t harbor.picaiba.com/kszny/mes-ui:1.0.0-tft ./ && docker push harbor.picaiba.com/kszny/mes-ui:1.0.0-tft
- name: deploy
image: harbor.picaiba.com/tools/kubectl:1.19.8
commands:
- 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-tft
- sleep 3
- kubectl scale --replicas=1 deployment/mes-ui -n mes-tft
depends_on:
- build
volumes:
- name: dockersock
host:
path: /var/run/docker.sock
- name: dockerconfig
host:
path: /root/.docker
trigger:
branch:
- master
event:
- push

14
Dockerfile Normal file
View File

@ -0,0 +1,14 @@
#FROM node:12 AS builder
#WORKDIR /app
#ADD package.json /app/
#RUN npm config set registry https://registry.npmmirror.com && npm install
#ADD . /app
#RUN npm run build
#
#FROM busybox
#LABEL maintainer thomas.hairong@gmail.com
#COPY --from=builder /app/dist /html
FROM busybox
LABEL maintainer thomas.hairong@gmail.com
COPY dist/ /html