Compare commits
16 Commits
dev-24.04
...
dev-ci-deb
| Author | SHA1 | Date | |
|---|---|---|---|
|
1e5a6dab7f | ||
|
|
aa0d0a3921 | ||
|
|
f7ea7f1a6c | ||
|
|
1b3fe6cbd4 | ||
|
|
36f5904766 | ||
|
|
81a429b171 | ||
|
|
d9a2821195 | ||
|
|
730e94f252 | ||
|
|
c2d53e9209 | ||
|
|
b1673491c6 | ||
|
|
ebd19390ed | ||
|
|
315e127083 | ||
|
|
c80cf743be | ||
|
|
60ec39b5c9 | ||
|
|
a413eb6aed | ||
|
|
56e30dfe47 |
@@ -10,11 +10,14 @@ cache:
|
|||||||
- package.json
|
- package.json
|
||||||
paths:
|
paths:
|
||||||
- node_modules
|
- node_modules
|
||||||
|
- dist/
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- export CNUI_TAG=$(date +%Y%m%d%H%M%S)
|
- export CNUI_TAG=$(date +%Y%m%d%H%M%S)
|
||||||
|
|
||||||
generate_git-log:
|
generate_git-log:
|
||||||
|
variables:
|
||||||
|
CI_DEBUG_TRACE: "true"
|
||||||
stage: gen_git-log
|
stage: gen_git-log
|
||||||
script:
|
script:
|
||||||
- if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then sed -i '/<body>/ a <a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./git-log.html">更新记录</a>' ./public/index.html; echo "添加更新记录链接"; fi;
|
- if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then sed -i '/<body>/ a <a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./git-log.html">更新记录</a>' ./public/index.html; echo "添加更新记录链接"; fi;
|
||||||
@@ -23,32 +26,30 @@ generate_git-log:
|
|||||||
- "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
|
- "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
|
||||||
- echo "</pre></body></html>" >> ./public/git-log.html
|
- echo "</pre></body></html>" >> ./public/git-log.html
|
||||||
- echo "处理 git-log.html 结束"
|
- echo "处理 git-log.html 结束"
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- public
|
|
||||||
only:
|
only:
|
||||||
- dev
|
- dev-ci-debug
|
||||||
tags:
|
tags:
|
||||||
- GN-XXG-Server
|
- GN-XXG-Server
|
||||||
|
|
||||||
build_project:
|
build_project:
|
||||||
stage: build_project
|
stage: build_project
|
||||||
|
variables:
|
||||||
|
CI_DEBUG_TRACE: "true"
|
||||||
script:
|
script:
|
||||||
- echo "npm install ..."
|
- echo "npm install ..."
|
||||||
- npm install --save-dev --unsafe-perm
|
- npm install --save-dev --unsafe-perm
|
||||||
- echo "npm run build"
|
- echo "npm run build"
|
||||||
- npm run build
|
- npm run build
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- dist
|
|
||||||
only:
|
only:
|
||||||
- dev
|
- dev-ci-debug
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- GN-XXG-Server
|
- GN-XXG-Server
|
||||||
|
|
||||||
build_image:
|
build_image:
|
||||||
stage: build_image
|
stage: build_image
|
||||||
|
variables:
|
||||||
|
CI_DEBUG_TRACE: "true"
|
||||||
script:
|
script:
|
||||||
- echo "docker build"
|
- echo "docker build"
|
||||||
- sudo docker build -t dev_cn-ui:$CNUI_TAG .
|
- sudo docker build -t dev_cn-ui:$CNUI_TAG .
|
||||||
@@ -58,13 +59,15 @@ build_image:
|
|||||||
- sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
|
- sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
|
||||||
when: on_success
|
when: on_success
|
||||||
only:
|
only:
|
||||||
- dev
|
- dev-ci-debug
|
||||||
tags:
|
tags:
|
||||||
- GN-XXG-Server
|
- GN-XXG-Server
|
||||||
|
|
||||||
|
|
||||||
build_release_image:
|
build_release_image:
|
||||||
stage: build_image
|
stage: build_image
|
||||||
|
variables:
|
||||||
|
CI_DEBUG_TRACE: "true"
|
||||||
script:
|
script:
|
||||||
- echo 'tag名称是'
|
- echo 'tag名称是'
|
||||||
- echo $CI_COMMIT_TAG
|
- echo $CI_COMMIT_TAG
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ FROM nginx:latest
|
|||||||
|
|
||||||
MAINTAINER shizhendong shizhendong@zdjizhi.com
|
MAINTAINER shizhendong shizhendong@zdjizhi.com
|
||||||
|
|
||||||
|
|
||||||
# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
|
# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
|
||||||
COPY dist/ /usr/share/nginx/html/
|
ADD dist/ /usr/share/nginx/html/
|
||||||
|
|
||||||
# nginx 配置 ， 制作镜像时不做处理 ， 容器可自己挂载配置文件
|
# nginx 配置 ， 制作镜像时不做处理 ， 容器可自己挂载配置文件
|
||||||
#COPY nginx.conf /etc/nginx/nginx.conf
|
#COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
"core-js": "^3.6.5",
|
"core-js": "^3.6.5",
|
||||||
"dayjs": "^1.10.5",
|
"dayjs": "^1.10.5",
|
||||||
"echarts": "^5.1.1",
|
"echarts": "^5.1.1",
|
||||||
"element-plus": "^1.0.2-beta.44",
|
"element-plus": "1.0.2-beta.44",
|
||||||
"leaflet": "^1.7.1",
|
"leaflet": "^1.7.1",
|
||||||
"lib-flexible": "^0.3.2",
|
"lib-flexible": "^0.3.2",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
|
|||||||
Reference in New Issue
Block a user