Merge pull request #91 from zhangnew/master

add https support for docker
crawlab-team · Apr 9, 2020 · 1fa6032 · 1fa6032
2 parents 4a8de77 + ba4bc63
commit 1fa6032
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -4,7 +4,7 @@ services:
     image: "tikazyq/artipub:latest"
     environment:
       MONGO_HOST: "mongo"
-      ARTIPUB_API_ADDRESS: "localhost:3000" # 后端API地址，如果安装地址不在本机，请修改为服务器IP地址+端口号（默认为3000）
+      ARTIPUB_API_ADDRESS: "http://localhost:3000" # 后端API地址，如果安装地址不在本机，请修改为协议+服务器IP地址+端口号（默认为3000）
     ports:
       - "8000:8000" # frontend
       - "3000:3000" # backend

diff --git a/docker_init.sh b/docker_init.sh
@@ -6,7 +6,7 @@ then
 	:
 else
 	jspath=`ls /frontend/umi.*.js`
-	sed -i "s?localhost:3000?${ARTIPUB_API_ADDRESS}?g" ${jspath}
+	sed -i "s?http://localhost:3000?${ARTIPUB_API_ADDRESS}?g" ${jspath}
 fi
 
 # start frontend

diff --git a/src/pages/document.ejs b/src/pages/document.ejs
@@ -9,7 +9,7 @@
     />
     <title>ArtiPub</title>
     <link rel="icon" href="/favicon.ico" type="image/x-icon" />
-    <script src="http://sdk.talkingdata.com/app/h5/v1?appid=378E36452AF64EDCA6EF5EAAF53A7993&vn=0.1.4&vc=0.1.4"></script>
+    <script src="https://h5.talkingdata.com/app/h5/v1?appid=378E36452AF64EDCA6EF5EAAF53A7993&vn=0.1.4&vc=0.1.4"></script>
   </head>
   <body>
     <noscript>Sorry, we need js to run correctly!</noscript>