Compare commits
42 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2bd0345251 | ||
|
|
80035e2082 | ||
|
|
94c47cf0a3 | ||
|
|
10109f5c95 | ||
|
|
1c309b2242 | ||
|
|
547aaaac5b | ||
|
|
bbc612e902 | ||
|
|
09afef4338 | ||
|
|
00a941c550 | ||
|
|
7a7d86c6d6 | ||
|
|
daab001b13 | ||
|
|
dd67cc4001 | ||
|
|
ae10488cc5 | ||
|
|
e8c8aa1646 | ||
|
|
ef0fd820dd | ||
|
|
98f523bf54 | ||
|
|
8ca1277ebb | ||
|
|
427bf78d31 | ||
|
|
1aeedd549d | ||
|
|
e8b1e82a2b | ||
|
|
53bad38f1d | ||
|
|
138f5975da | ||
|
|
3e7a71ea8a | ||
|
|
92ef524d17 | ||
|
|
99ae13987e | ||
|
|
65cd2f372b | ||
|
|
364781a817 | ||
|
|
b1043bb0ad | ||
|
|
7e58336ec8 | ||
|
|
cfa2fb659e | ||
|
|
763ee019c6 | ||
|
|
a2495ee242 | ||
|
|
fec74aec51 | ||
|
|
da3e94d36e | ||
|
|
d7ea50ce19 | ||
|
|
bde8f19dfb | ||
|
|
539283304c | ||
|
|
e8af8c5419 | ||
|
|
ca6da7b25a | ||
|
|
98bd847c78 | ||
|
|
2827fb8222 | ||
|
|
0aa1581314 |
62
.gitlab-ci.yml
Normal file
62
.gitlab-ci.yml
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
#asdad
|
||||||
|
stages:
|
||||||
|
- gen_git-log
|
||||||
|
- build_project
|
||||||
|
- build_image
|
||||||
|
|
||||||
|
cache:
|
||||||
|
key:
|
||||||
|
files:
|
||||||
|
- package.json
|
||||||
|
paths:
|
||||||
|
- node_modules
|
||||||
|
- dist/
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- export UI_TAG=$(date +%Y%m%d%H%M%S)
|
||||||
|
|
||||||
|
|
||||||
|
generate_git-log:
|
||||||
|
stage: gen_git-log
|
||||||
|
script:
|
||||||
|
- if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./git-log.html">更新记录</a>\n</body>+g' ./public/index.html; echo "添加更新记录链接"; fi;
|
||||||
|
- echo "最近的100个提交记录"
|
||||||
|
- echo "<!DOCTYPE html><html><head><meta charset='utf-8'></head><body><pre>" > ./public/git-log.html
|
||||||
|
- "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
|
||||||
|
- echo "</pre></body></html>" >> ./public/git-log.html
|
||||||
|
- echo "处理 git-log.html 结束"
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- public/index.html
|
||||||
|
- public/git-log.html
|
||||||
|
only:
|
||||||
|
- dev-cicd
|
||||||
|
tags:
|
||||||
|
- GN-XXG-Server
|
||||||
|
|
||||||
|
build_project:
|
||||||
|
stage: build_project
|
||||||
|
script:
|
||||||
|
- echo "npm install ..."
|
||||||
|
- npm install --save-dev --unsafe-perm
|
||||||
|
- echo "npm run build"
|
||||||
|
- npm run build
|
||||||
|
only:
|
||||||
|
- dev-cicd
|
||||||
|
tags:
|
||||||
|
- GN-XXG-Server
|
||||||
|
|
||||||
|
build_image:
|
||||||
|
stage: build_image
|
||||||
|
script:
|
||||||
|
- echo "docker build"
|
||||||
|
- sudo docker build -t dev_cn-ui:$UI_TAG .
|
||||||
|
- echo "docker tag"
|
||||||
|
- sudo docker tag dev_cn-ui:$UI_TAG 192.168.40.153:9080/test/dev_cn-ui:$UI_TAG
|
||||||
|
- echo "docker push"
|
||||||
|
- sudo docker push 192.168.40.153:9080/test/dev_cn-ui:$UI_TAG
|
||||||
|
when: on_success
|
||||||
|
only:
|
||||||
|
- dev-cicd
|
||||||
|
tags:
|
||||||
|
- GN-XXG-Server
|
||||||
9
Dockerfile
Normal file
9
Dockerfile
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
FROM nginx:latest
|
||||||
|
|
||||||
|
MAINTAINER shizhendong shizhendong@zdjizhi.com
|
||||||
|
|
||||||
|
# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
|
||||||
|
COPY dist/ /usr/share/nginx/html/
|
||||||
|
|
||||||
|
# nginx 配置 ， 制作镜像时不做处理 ， 容器可自己挂载配置文件
|
||||||
|
#COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
|
<p>12</p>
|
||||||
<el-input v-model="username"></el-input>
|
<el-input v-model="username"></el-input>
|
||||||
<el-input v-model="pin"></el-input>
|
<el-input v-model="pin"></el-input>
|
||||||
<button type="button" @click="login">Login</button>
|
<button type="button" @click="login">Login</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user