Compare commits
No commits in common. "746654cd7115b193ff9fe1bd65cd2e3b36e8f420" and "d46bf70433c966d0607e02a3cff01f76b2099607" have entirely different histories.
746654cd71
...
d46bf70433
41
.drone.yml
41
.drone.yml
@ -1,41 +0,0 @@
|
|||||||
---
|
|
||||||
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
10
Dockerfile
@ -1,10 +0,0 @@
|
|||||||
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",
|
"name": "code-brick-wd",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"code-brick-zj": "^0.0.5",
|
"code-brick-zj": "^0.0.4",
|
||||||
"core-js": "^3.8.3",
|
"core-js": "^3.8.3",
|
||||||
"element-ui": "^2.15.12",
|
"element-ui": "^2.15.12",
|
||||||
"vue": "^2.6.14",
|
"vue": "^2.6.14",
|
||||||
@ -4007,9 +4007,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/code-brick-zj": {
|
"node_modules/code-brick-zj": {
|
||||||
"version": "0.0.5",
|
"version": "0.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.4.tgz",
|
||||||
"integrity": "sha512-wvHr8EFznEkIAi9BaXGZbNRRTa+18yBVH5yyuYaaAqiXW7WINbEiFkgMqRqVmRldPNbKXIHkbsGnX+Zk6dI/nA=="
|
"integrity": "sha512-KSQ/drfIpoZKTrcARtuwG+6olde7fBYl+38Kialqa1NSoSDhPMqXTVw2N4KfA4MlucXQ/s3KZjfUsmKVZ70KkA=="
|
||||||
},
|
},
|
||||||
"node_modules/color-convert": {
|
"node_modules/color-convert": {
|
||||||
"version": "1.9.3",
|
"version": "1.9.3",
|
||||||
@ -14473,9 +14473,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"code-brick-zj": {
|
"code-brick-zj": {
|
||||||
"version": "0.0.5",
|
"version": "0.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.4.tgz",
|
||||||
"integrity": "sha512-wvHr8EFznEkIAi9BaXGZbNRRTa+18yBVH5yyuYaaAqiXW7WINbEiFkgMqRqVmRldPNbKXIHkbsGnX+Zk6dI/nA=="
|
"integrity": "sha512-KSQ/drfIpoZKTrcARtuwG+6olde7fBYl+38Kialqa1NSoSDhPMqXTVw2N4KfA4MlucXQ/s3KZjfUsmKVZ70KkA=="
|
||||||
},
|
},
|
||||||
"color-convert": {
|
"color-convert": {
|
||||||
"version": "1.9.3",
|
"version": "1.9.3",
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
"lint": "vue-cli-service lint"
|
"lint": "vue-cli-service lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"code-brick-zj": "^0.0.5",
|
"code-brick-zj": "^0.0.4",
|
||||||
"core-js": "^3.8.3",
|
"core-js": "^3.8.3",
|
||||||
"element-ui": "^2.15.12",
|
"element-ui": "^2.15.12",
|
||||||
"vue": "^2.6.14",
|
"vue": "^2.6.14",
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<p>
|
<p>
|
||||||
组件包目前封装常用的四个组件:表格,搜索区域,分页,对话框。包npm地址为:https://www.npmjs.com/package/code-brick-zj。
|
组件包目前封装常用的四个组件:表格,搜索区域,分页,对话框。包npm地址为:https://www.npmjs.com/package/code-brick-zj。
|
||||||
</p>
|
</p>
|
||||||
<p>文档当前使用的组件包的版本为:0.0.5</p>
|
<p>文档当前使用的组件包的版本为:0.0.3</p>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
@ -100,7 +100,7 @@
|
|||||||
stripe
|
stripe
|
||||||
:page="1"
|
:page="1"
|
||||||
:limit="20"
|
:limit="20"
|
||||||
:cancel-border="true"
|
border
|
||||||
/>
|
/>
|
||||||
<el-collapse>
|
<el-collapse>
|
||||||
<el-collapse-item title="显示代码">
|
<el-collapse-item title="显示代码">
|
||||||
@ -108,7 +108,7 @@
|
|||||||
<code>stripe</code>属性可以创建带斑马纹的表格。它接受一个
|
<code>stripe</code>属性可以创建带斑马纹的表格。它接受一个
|
||||||
<code>Boolean</code>,默认为<code>false</code>,
|
<code>Boolean</code>,默认为<code>false</code>,
|
||||||
设置为<code>true</code>即为启用。默认情况下,Table
|
设置为<code>true</code>即为启用。默认情况下,Table
|
||||||
组件是有竖直方向的边框的,如果需要取消,可以使用<code>cancel-border</code>属性,它接受一个<code>Boolean</code>,设置为<code>true</code>即可取消边框。
|
组件是不具有竖直方向的边框的,如果需要,可以使用<code>border</code>属性,它接受一个<code>Boolean</code>,设置为<code>true</code>即可启用。
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<pre>
|
<pre>
|
||||||
@ -119,7 +119,7 @@
|
|||||||
:limit="20"
|
:limit="20"
|
||||||
:table-data="tableData"
|
:table-data="tableData"
|
||||||
stripe
|
stripe
|
||||||
:cancel-border="true"
|
border
|
||||||
/>
|
/>
|
||||||
<<span>/template</span>>
|
<<span>/template</span>>
|
||||||
</pre>
|
</pre>
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user