更新ci

.gitlab-ci.yml

@@ -1,17 +1,13 @@
 variables:
-  DOCKER_REGION: "registry.cn-qingdao.aliyuncs.com"
-  DOCKER_NAMESPACE: "lacus"
-  DOCKER_USERNAME: "rainsun20170129"
-  DOCKER_PASSWORD: "100200300Wdy*"
-  APP_NAME: "cherry_frontend"
-  BUILD_IMAGE: "node:12-alpine"
-  IMAGE_NAME: "$DOCKER_REGION/$DOCKER_NAMESPACE/$APP_NAME:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
+  APP_NAME: "cherry_fe"
+  IMAGE_NAME: "$APP_NAME:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
   DOCKER_FILE_PATH: "./Dockerfile"
 
 stages:
   - build
   - clear
   - deploy
+  - rmimg
 
 build:
   stage: build
@@ -22,12 +18,9 @@ build:
     - dockerbase
   script:
     - ls -a
-    - docker login --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} ${DOCKER_REGION}
     - docker build -t ${IMAGE_NAME} -f ${DOCKER_FILE_PATH} .
-    - docker push ${IMAGE_NAME}
-    - docker rmi ${IMAGE_NAME}
 
-pveclear:
+clear:
   stage: clear
   tags:
     - dockerbase
@@ -38,18 +31,7 @@ pveclear:
     - docker rm ${APP_NAME}
   allow_failure: true
 
-ali2clear:
-  stage: clear
-  tags:
-    - ali2
-  only:
-    - master
-  script:
-    - docker stop ${APP_NAME}
-    - docker rm ${APP_NAME}
-  allow_failure: true
-
-pvedeploy:
+deploy:
   stage: deploy
   tags:
     - dockerbase
@@ -57,22 +39,16 @@ pvedeploy:
     - master
   script:
     - ls -a
-    - docker login --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} ${DOCKER_REGION}
-    - docker pull ${IMAGE_NAME}
     - docker run -d --name ${APP_NAME} -p 5005:80 ${IMAGE_NAME}
   cache:
     policy: pull
 
-ali2deploy:
-  stage: deploy
+rmimg:
+  stage: rmimg
   tags:
-    - ali2
+    - dockerbase
   only:
     - master
   script:
-    - ls -a
-    - docker login --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} ${DOCKER_REGION}
-    - docker pull ${IMAGE_NAME}
-    - docker run -d --name ${APP_NAME} -p 127.0.0.1:5006:80 ${IMAGE_NAME}
-  cache:
-    policy: pull
+    - docker image rm `docker image ls -q cherry_fe | tail -1`
+  allow_failure: true

dist/index.html

@@ -9,4 +9,4 @@
         'font-size:12px;color:#999999;', (new Date).getFullYear());
     }
     catch (e) {
-    }</script><script src="//at.alicdn.com/t/font_1630993_l8ge7m6darc.js"></script><link href="/css/chunk-12ce693a.d4f55bfe.css" rel="prefetch"><link href="/css/chunk-208ba6f0.0ceb0ae3.css" rel="prefetch"><link href="/css/chunk-20a4acfd.ee5426c9.css" rel="prefetch"><link href="/css/chunk-452984ea.54d1eb07.css" rel="prefetch"><link href="/css/chunk-4da73b60.614bb34f.css" rel="prefetch"><link href="/css/chunk-7b388ded.60b86910.css" rel="prefetch"><link href="/css/chunk-83311de2.521c3391.css" rel="prefetch"><link href="/css/chunk-de5b02e4.9e01b52c.css" rel="prefetch"><link href="/js/chunk-12ce693a.9398fef4.js" rel="prefetch"><link href="/js/chunk-208ba6f0.bca4e7a8.js" rel="prefetch"><link href="/js/chunk-20a4acfd.05b70be8.js" rel="prefetch"><link href="/js/chunk-452984ea.0928994b.js" rel="prefetch"><link href="/js/chunk-4da73b60.f793f9c8.js" rel="prefetch"><link href="/js/chunk-7b388ded.16d3647e.js" rel="prefetch"><link href="/js/chunk-83311de2.5b01cf23.js" rel="prefetch"><link href="/js/chunk-de5b02e4.468f0170.js" rel="prefetch"><link href="/css/app.2c2f5006.css" rel="preload" as="style"><link href="/css/chunk-vendors.23c1f75a.css" rel="preload" as="style"><link href="/js/app.c3f6e2cb.js" rel="modulepreload" as="script"><link href="/js/chunk-vendors.9d54842c.js" rel="modulepreload" as="script"><link href="/css/chunk-vendors.23c1f75a.css" rel="stylesheet"><link href="/css/app.2c2f5006.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/favicon.ico"><link rel="icon" type="image/png" sizes="16x16" href="/favicon.ico"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#e54d42"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="Cherry"><link rel="apple-touch-icon" href="/favicon.ico"><link rel="mask-icon" href="/favicon.ico" color="#e54d42"><meta name="msapplication-TileImage" content="/favicon.ico"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but cust doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script type="module" src="/js/chunk-vendors.9d54842c.js"></script><script type="module" src="/js/app.c3f6e2cb.js"></script><script>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script><script src="/js/chunk-vendors-legacy.9d54842c.js" nomodule></script><script src="/js/app-legacy.35a6d8c6.js" nomodule></script></body></html>
+    }</script><script src="//at.alicdn.com/t/font_1630993_l8ge7m6darc.js"></script><link href="/css/chunk-0b39892e.f0f2b57c.css" rel="prefetch"><link href="/css/chunk-47054a92.266403eb.css" rel="prefetch"><link href="/css/chunk-48c8a9b6.336e2b50.css" rel="prefetch"><link href="/css/chunk-50318da4.0ded23c0.css" rel="prefetch"><link href="/css/chunk-60536306.1989a3e3.css" rel="prefetch"><link href="/css/chunk-68992484.db4bb3be.css" rel="prefetch"><link href="/css/chunk-b948d8ea.f2742bdf.css" rel="prefetch"><link href="/css/chunk-d8e8c53e.c459ae97.css" rel="prefetch"><link href="/js/chunk-0b39892e.f3941107.js" rel="prefetch"><link href="/js/chunk-47054a92.08cc0b31.js" rel="prefetch"><link href="/js/chunk-48c8a9b6.7c6dd5e4.js" rel="prefetch"><link href="/js/chunk-50318da4.fa769ba7.js" rel="prefetch"><link href="/js/chunk-60536306.315d1595.js" rel="prefetch"><link href="/js/chunk-68992484.51991eb0.js" rel="prefetch"><link href="/js/chunk-b948d8ea.e379daab.js" rel="prefetch"><link href="/js/chunk-d8e8c53e.0aa121db.js" rel="prefetch"><link href="/css/app.22388f63.css" rel="preload" as="style"><link href="/css/chunk-vendors.23c1f75a.css" rel="preload" as="style"><link href="/js/app.54265dcc.js" rel="modulepreload" as="script"><link href="/js/chunk-vendors.87fddfcf.js" rel="modulepreload" as="script"><link href="/css/chunk-vendors.23c1f75a.css" rel="stylesheet"><link href="/css/app.22388f63.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/favicon.ico"><link rel="icon" type="image/png" sizes="16x16" href="/favicon.ico"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#e54d42"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="Cherry"><link rel="apple-touch-icon" href="/favicon.ico"><link rel="mask-icon" href="/favicon.ico" color="#e54d42"><meta name="msapplication-TileImage" content="/favicon.ico"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but cust doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script type="module" src="/js/chunk-vendors.87fddfcf.js"></script><script type="module" src="/js/app.54265dcc.js"></script><script>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script><script src="/js/chunk-vendors-legacy.87fddfcf.js" nomodule></script><script src="/js/app-legacy.82595b57.js" nomodule></script></body></html>

dist/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.48bc000ed90914eb64bc19466b3545fe.js"
+  "/precache-manifest.9174588a2580f23adc1fad0fa4fd03bc.js"
 );
 
 workbox.core.setCacheNameDetails({prefix: "cherry"});