Update .gitlab-ci.yml

2021-10-25 07:19:30 +00:00 · 2021-10-25 07:11:56 +00:00 · 2021-10-25 07:04:20 +00:00 · 2021-10-25 06:07:00 +00:00 · 2021-10-25 05:58:16 +00:00 · 2021-10-25 03:45:46 +00:00
3 changed files with 15 additions and 11 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,11 +10,14 @@ cache:
      - package.json
  paths:
    - node_modules
+    - dist/

 before_script:
  - export CNUI_TAG=$(date +%Y%m%d%H%M%S)

 generate_git-log:
+  variables:
+    CI_DEBUG_TRACE: "true"
  stage: gen_git-log
  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;
@@ -23,32 +26,30 @@ generate_git-log:
    - "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
  only:
-    - dev
+    - dev-ci-debug
  tags:
    - GN-XXG-Server

 build_project:
  stage: build_project
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - echo "npm install ..."
    - npm install --save-dev --unsafe-perm
    - echo "npm run build"
    - npm run build
-  artifacts:
-    paths:
-      - dist
  only:
-    - dev
+    - dev-ci-debug
    - tags
  tags:
    - GN-XXG-Server

 build_image:
  stage: build_image
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - echo "docker build"
    - 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
  when: on_success
  only:
-    - dev
+    - dev-ci-debug
  tags:
    - GN-XXG-Server


 build_release_image:
  stage: build_image
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - echo 'tag名称是'
    - echo $CI_COMMIT_TAG
--- a/3
+++ b/3
@@ -2,8 +2,9 @@ FROM nginx:latest

 MAINTAINER shizhendong shizhendong@zdjizhi.com

+
 # 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
-COPY dist/  /usr/share/nginx/html/
+ADD dist/  /usr/share/nginx/html/

 # nginx 配置 ， 制作镜像时不做处理 ， 容器可自己挂载配置文件
 #COPY nginx.conf /etc/nginx/nginx.conf
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
    "core-js": "^3.6.5",
    "dayjs": "^1.10.5",
    "echarts": "^5.1.1",
-    "element-plus": "^1.0.2-beta.44",
+    "element-plus": "1.0.2-beta.44",
    "leaflet": "^1.7.1",
    "lib-flexible": "^0.3.2",
    "lodash": "^4.17.21",
Author	SHA1	Message	Date
张帅	1e5a6dab7f	Update .gitlab-ci.yml	2021-10-25 07:19:30 +00:00
张帅	aa0d0a3921	Update .gitlab-ci.yml	2021-10-25 07:11:56 +00:00
张帅	f7ea7f1a6c	Update .gitlab-ci.yml	2021-10-25 07:04:20 +00:00
张帅	1b3fe6cbd4	Update Dockerfile	2021-10-25 06:07:00 +00:00
张帅	36f5904766	Update Dockerfile	2021-10-25 05:58:16 +00:00
张帅	81a429b171	Update Dockerfile	2021-10-25 03:45:46 +00:00
张帅	d9a2821195	Update Dockerfile	2021-10-25 03:17:01 +00:00
zhangshuai	730e94f252	feat :还原Tiles文件	2021-10-23 21:34:13 +08:00
zhangshuai	c2d53e9209	feat :删除Tiles文件	2021-10-23 21:07:09 +08:00
张帅	b1673491c6	Update .gitlab-ci.yml	2021-10-22 09:53:40 +00:00
张帅	ebd19390ed	Update .gitlab-ci.yml	2021-10-22 09:44:32 +00:00
方顺健	315e127083	Update package.json	2021-10-22 07:20:06 +00:00
方顺健	c80cf743be	Update .gitlab-ci.yml file	2021-10-20 02:43:53 +00:00
方顺健	60ec39b5c9	Update .gitlab-ci.yml file	2021-10-20 02:35:16 +00:00
方顺健	a413eb6aed	Update .gitlab-ci.yml file	2021-10-20 02:12:17 +00:00
方顺健	56e30dfe47	Update .gitlab-ci.yml	2021-10-20 02:08:03 +00:00