Compare commits
6 Commits
d46bf70433
...
746654cd71
Author | SHA1 | Date | |
---|---|---|---|
746654cd71 | |||
67dd6b0760 | |||
7aa6375f22 | |||
565940ea8b | |||
d654c05b46 | |||
8ff16edec0 |
41
.drone.yml
Normal file
41
.drone.yml
Normal 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 --add-host github.com:192.30.255.113 -t harbor.picaiba.com/kszny/cnbmai:1.0.0 ./ && docker push harbor.picaiba.com/kszny/cnbmai:1.0.0
|
||||
|
||||
- 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/cnbmai -n cnbmai
|
||||
- sleep 3
|
||||
- kubectl scale --replicas=1 deployment/cnbmai -n cnbmai
|
||||
depends_on:
|
||||
- build
|
||||
|
||||
volumes:
|
||||
- name: dockersock
|
||||
host:
|
||||
path: /var/run/docker.sock
|
||||
- name: dockerconfig
|
||||
host:
|
||||
path: /root/.docker
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- develop
|
||||
event:
|
||||
- push
|
10
Dockerfile
Normal file
10
Dockerfile
Normal file
@ -0,0 +1,10 @@
|
||||
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
|
14
package-lock.json
generated
14
package-lock.json
generated
@ -8,7 +8,7 @@
|
||||
"name": "code-brick-wd",
|
||||
"version": "0.1.0",
|
||||
"dependencies": {
|
||||
"code-brick-zj": "^0.0.4",
|
||||
"code-brick-zj": "^0.0.5",
|
||||
"core-js": "^3.8.3",
|
||||
"element-ui": "^2.15.12",
|
||||
"vue": "^2.6.14",
|
||||
@ -4007,9 +4007,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/code-brick-zj": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.4.tgz",
|
||||
"integrity": "sha512-KSQ/drfIpoZKTrcARtuwG+6olde7fBYl+38Kialqa1NSoSDhPMqXTVw2N4KfA4MlucXQ/s3KZjfUsmKVZ70KkA=="
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.5.tgz",
|
||||
"integrity": "sha512-wvHr8EFznEkIAi9BaXGZbNRRTa+18yBVH5yyuYaaAqiXW7WINbEiFkgMqRqVmRldPNbKXIHkbsGnX+Zk6dI/nA=="
|
||||
},
|
||||
"node_modules/color-convert": {
|
||||
"version": "1.9.3",
|
||||
@ -14473,9 +14473,9 @@
|
||||
}
|
||||
},
|
||||
"code-brick-zj": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.4.tgz",
|
||||
"integrity": "sha512-KSQ/drfIpoZKTrcARtuwG+6olde7fBYl+38Kialqa1NSoSDhPMqXTVw2N4KfA4MlucXQ/s3KZjfUsmKVZ70KkA=="
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.5.tgz",
|
||||
"integrity": "sha512-wvHr8EFznEkIAi9BaXGZbNRRTa+18yBVH5yyuYaaAqiXW7WINbEiFkgMqRqVmRldPNbKXIHkbsGnX+Zk6dI/nA=="
|
||||
},
|
||||
"color-convert": {
|
||||
"version": "1.9.3",
|
||||
|
@ -8,7 +8,7 @@
|
||||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"code-brick-zj": "^0.0.4",
|
||||
"code-brick-zj": "^0.0.5",
|
||||
"core-js": "^3.8.3",
|
||||
"element-ui": "^2.15.12",
|
||||
"vue": "^2.6.14",
|
||||
|
@ -3,7 +3,7 @@
|
||||
<p>
|
||||
组件包目前封装常用的四个组件:表格,搜索区域,分页,对话框。包npm地址为:https://www.npmjs.com/package/code-brick-zj。
|
||||
</p>
|
||||
<p>文档当前使用的组件包的版本为:0.0.3</p>
|
||||
<p>文档当前使用的组件包的版本为:0.0.5</p>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
@ -100,7 +100,7 @@
|
||||
stripe
|
||||
:page="1"
|
||||
:limit="20"
|
||||
border
|
||||
:cancel-border="true"
|
||||
/>
|
||||
<el-collapse>
|
||||
<el-collapse-item title="显示代码">
|
||||
@ -108,7 +108,7 @@
|
||||
<code>stripe</code>属性可以创建带斑马纹的表格。它接受一个
|
||||
<code>Boolean</code>,默认为<code>false</code>,
|
||||
设置为<code>true</code>即为启用。默认情况下,Table
|
||||
组件是不具有竖直方向的边框的,如果需要,可以使用<code>border</code>属性,它接受一个<code>Boolean</code>,设置为<code>true</code>即可启用。
|
||||
组件是有竖直方向的边框的,如果需要取消,可以使用<code>cancel-border</code>属性,它接受一个<code>Boolean</code>,设置为<code>true</code>即可取消边框。
|
||||
</div>
|
||||
<div>
|
||||
<pre>
|
||||
@ -119,7 +119,7 @@
|
||||
:limit="20"
|
||||
:table-data="tableData"
|
||||
stripe
|
||||
border
|
||||
:cancel-border="true"
|
||||
/>
|
||||
<<span>/template</span>>
|
||||
</pre>
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user