From 7fafb01d1d9e376ee3b0f831465225ed7f9a1bff Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@163.com>
Date: Mon, 16 May 2022 14:17:29 +0800
Subject: [PATCH] updated docker build

---
 .github/workflows/dockerpush.yml |  5 +++++
 bin/docker-start-master.sh       | 19 +++++++++++++------
 frontend/.env.docker             |  2 ++
 frontend/public/index.html       |  4 +++-
 frontend/src/main.ts             |  7 ++++++-
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dockerpush.yml b/.github/workflows/dockerpush.yml
index 44e5c9dd..f8aa6867 100644
--- a/.github/workflows/dockerpush.yml
+++ b/.github/workflows/dockerpush.yml
@@ -43,3 +43,8 @@ jobs:
 
         docker tag image $IMAGE_ID:$VERSION
         docker push $IMAGE_ID:$VERSION
+
+	if [[ $VERSION -eq "latest" ]]; then
+          docker tag image $IMAGE_ID:main
+          docker push $IMAGE_ID:main
+	fi
diff --git a/bin/docker-start-master.sh b/bin/docker-start-master.sh
index 9c40b685..49076932 100755
--- a/bin/docker-start-master.sh
+++ b/bin/docker-start-master.sh
@@ -4,12 +4,19 @@ then
 	:
 else
 	indexpath=/app/dist/index.html
-	sed -i "s?/js/?${CRAWLAB_BASE_URL}/js/?g" ${indexpath}
-	sed -i "s?/css/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath}
-
-	sed -i "s/  <link rel=\"icon\" type=\"image\/x-icon\" href=\"/  <link rel=\"icon\" type=\"image\/x-icon\" href=\"\/${CRAWLAB_BASE_URL}/g"  ${indexpath}
-	sed -i "s/  <link rel=\"stylesheet\" href=\"/  <link rel=\"stylesheet\" href=\"${CRAWLAB_BASE_URL}\//g"  ${indexpath}
-	sed -i "s/  window.VUE_APP_API_BASE_URL = '/  window.VUE_APP_API_BASE_URL = '\/${CRAWLAB_BASE_URL}/g" ${indexpath}
+	if [[ -v CRAWLAB_BASE_URL ]]; then
+		sed -i "s?/js/?${CRAWLAB_BASE_URL}/js/?g" ${indexpath}
+		sed -i "s?/css/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath}
+		sed -i "s/  <link rel=\"icon\" type=\"image\/x-icon\" href=\"/  <link rel=\"icon\" type=\"image\/x-icon\" href=\"\/${CRAWLAB_BASE_URL}/g"  ${indexpath}
+		sed -i "s/  <link rel=\"stylesheet\" href=\"/  <link rel=\"stylesheet\" href=\"${CRAWLAB_BASE_URL}\//g"  ${indexpath}
+		sed -i "s/  window.VUE_APP_API_BASE_URL = '/  window.VUE_APP_API_BASE_URL = '\/${CRAWLAB_BASE_URL}/g" ${indexpath}
+	fi
+	if [[ -v CRAWLAB_INIT_BAIDU_TONGJI ]]; then
+		sed -i "s/  window.VUE_APP_INIT_BAIDU_TONGJI =/  window.VUE_APP_INIT_BAIDU_TONGJI = '${CRAWLAB_INIT_BAIDU_TONGJI}'/g" ${indexpath}
+	fi
+	if [[ -v CRAWLAB_INIT_UMENG ]]; then
+		sed -i "s/  window.VUE_APP_INIT_UMENG =/  window.VUE_APP_INIT_UMENG = '${CRAWLAB_INIT_UMENG}'/g" ${indexpath}
+	fi
 fi
 
 # start nginx
diff --git a/frontend/.env.docker b/frontend/.env.docker
index 63f2689b..dfa712ba 100644
--- a/frontend/.env.docker
+++ b/frontend/.env.docker
@@ -1 +1,3 @@
 VUE_APP_API_BASE_URL=/api
+VUE_APP_INIT_BAIDU_TONGJI=
+VUE_APP_INIT_UMENG=
diff --git a/frontend/public/index.html b/frontend/public/index.html
index 113fdc38..16afae23 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -8,7 +8,9 @@
   <meta content="IE=edge" http-equiv="X-UA-Compatible">
   <meta content="width=device-width,initial-scale=1.0" name="viewport">
   <script>
-  window.VUE_APP_API_BASE_URL = '<%= VUE_APP_API_BASE_URL %>'
+      window.VUE_APP_API_BASE_URL = '<%= VUE_APP_API_BASE_URL %>';
+      window.VUE_APP_INIT_UMENG = '<%= VUE_APP_INIT_UMENG %>';
+      window.VUE_APP_INIT_BAIDU_TONGJI = '<%= VUE_APP_INIT_BAIDU_TONGJI %>';
   </script>
   <script src="/js/vue3-sfc-loader.js"></script>
   <script src="/js/umeng.js"></script>
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 7c861333..0b0edbe8 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -3,5 +3,10 @@ import 'vue';
 import {createApp} from 'crawlab-ui';
 
 (async function () {
-  await createApp();
+  await createApp({
+    // @ts-ignore
+    initBaiduTongji: window['VUE_APP_INIT_BAIDU_TONGJI'] !== 'false',
+    // @ts-ignore
+    initUmeng: window['VUE_APP_INIT_UMENG'] !== 'false',
+  });
 })();