Skip to content

Commit a352ad7

Browse files
MereithhhMereithhh
committedJun 27, 2023
chore: 一键脚本增加中国ip检测，分流国内外下载地址
·
v0.54.0doc-0.12.167
1 parent 7010d32 commit a352ad7

File tree

4 files changed

+80
-10
lines changed

4 files changed

+80
-10
lines changed
 

‎docker-compose/docker-compose-template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
vanblog:
5-
image: mereith/van-blog:vanblog_version
5+
image: vanblog_image
66
restart: always
77
environment:
88
TZ: "Asia/Shanghai"

‎docs/.vuepress/public/docker-compose-template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
vanblog:
5-
image: mereith/van-blog:vanblog_version
5+
image: vanblog_image
66
restart: always
77
environment:
88
TZ: "Asia/Shanghai"

‎docs/.vuepress/public/vanblog.sh

+39-4
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,40 @@ pre_check() {
6666
exit 1
6767
fi
6868

69+
## China_IP
70+
if [[ -z "${CN}" ]]; then
71+
if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
72+
echo "根据ipapi.co提供的信息，当前IP可能在中国"
73+
read -e -r -p "是否选用中国镜像完成安装? [Y/n] " input
74+
case $input in
75+
[yY][eE][sS] | [yY])
76+
echo "使用中国镜像"
77+
CN=true
78+
;;
79+
80+
[nN][oO] | [nN])
81+
echo "不使用中国镜像"
82+
;;
83+
*)
84+
echo "使用中国镜像"
85+
CN=true
86+
;;
87+
esac
88+
fi
89+
fi
90+
91+
if [[ -z "${CN}" ]]; then
92+
Get_Docker_URL="get.docker.com"
93+
GITHUB_URL="dn-dao-github-mirror.daocloud.io"
94+
Get_Docker_Argu=" "
95+
Docker_IMG="mereith\/van-blog:latest"
96+
else
97+
Get_Docker_URL="get.daocloud.io/docker"
98+
GITHUB_URL="github.com"
99+
Get_Docker_Argu=" -s docker --mirror Aliyun"
100+
Docker_IMG="registry.cn-beijing.aliyuncs.com\/mereith\/van-blog:latest"
101+
fi
102+
69103
}
70104

71105
confirm() {
@@ -223,9 +257,9 @@ config() {
223257
if [[ -z "${vanblog_https_port}" ]]; then
224258
vanblog_https_port=443
225259
fi
226-
if [[ -z "${vanblog_version}" ]]; then
227-
vanblog_version="latest"
228-
fi
260+
# if [[ -z "${vanblog_version}" ]]; then
261+
# vanblog_version="latest"
262+
# fi
229263

230264
rm ${VANBLOG_BASE_PATH}/docker-compose.yaml >/dev/null 2>&1
231265
cp ${VANBLOG_BASE_PATH}/docker-compose-template.yaml ${VANBLOG_BASE_PATH}/docker-compose.yaml >/dev/null 2>&1
@@ -234,7 +268,8 @@ config() {
234268
sed -i "s/vanblog_http_port/${vanblog_http_port}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
235269
sed -i "s/vanblog_https_port/${vanblog_https_port}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
236270
# sed -i "s/vanblog_domains/${vanblog_domains}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
237-
sed -i "s/vanblog_version/${vanblog_version}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
271+
# sed -i "s/vanblog_version/${vanblog_version}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
272+
sed -i "s/vanblog_image/${Docker_IMG}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
238273

239274
mkdir -p $VANBLOG_DATA_PATH
240275

‎scripts/vanblog.sh

+39-4
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,40 @@ pre_check() {
6666
exit 1
6767
fi
6868

69+
## China_IP
70+
if [[ -z "${CN}" ]]; then
71+
if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
72+
echo "根据ipapi.co提供的信息，当前IP可能在中国"
73+
read -e -r -p "是否选用中国镜像完成安装? [Y/n] " input
74+
case $input in
75+
[yY][eE][sS] | [yY])
76+
echo "使用中国镜像"
77+
CN=true
78+
;;
79+
80+
[nN][oO] | [nN])
81+
echo "不使用中国镜像"
82+
;;
83+
*)
84+
echo "使用中国镜像"
85+
CN=true
86+
;;
87+
esac
88+
fi
89+
fi
90+
91+
if [[ -z "${CN}" ]]; then
92+
Get_Docker_URL="get.docker.com"
93+
GITHUB_URL="dn-dao-github-mirror.daocloud.io"
94+
Get_Docker_Argu=" "
95+
Docker_IMG="mereith\/van-blog:latest"
96+
else
97+
Get_Docker_URL="get.daocloud.io/docker"
98+
GITHUB_URL="github.com"
99+
Get_Docker_Argu=" -s docker --mirror Aliyun"
100+
Docker_IMG="registry.cn-beijing.aliyuncs.com\/mereith\/van-blog:latest"
101+
fi
102+
69103
}
70104

71105
confirm() {
@@ -223,9 +257,9 @@ config() {
223257
if [[ -z "${vanblog_https_port}" ]]; then
224258
vanblog_https_port=443
225259
fi
226-
if [[ -z "${vanblog_version}" ]]; then
227-
vanblog_version="latest"
228-
fi
260+
# if [[ -z "${vanblog_version}" ]]; then
261+
# vanblog_version="latest"
262+
# fi
229263

230264
rm ${VANBLOG_BASE_PATH}/docker-compose.yaml >/dev/null 2>&1
231265
cp ${VANBLOG_BASE_PATH}/docker-compose-template.yaml ${VANBLOG_BASE_PATH}/docker-compose.yaml >/dev/null 2>&1
@@ -234,7 +268,8 @@ config() {
234268
sed -i "s/vanblog_http_port/${vanblog_http_port}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
235269
sed -i "s/vanblog_https_port/${vanblog_https_port}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
236270
# sed -i "s/vanblog_domains/${vanblog_domains}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
237-
sed -i "s/vanblog_version/${vanblog_version}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
271+
# sed -i "s/vanblog_version/${vanblog_version}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
272+
sed -i "s/vanblog_image/${Docker_IMG}/g" ${VANBLOG_BASE_PATH}/docker-compose.yaml
238273

239274
mkdir -p $VANBLOG_DATA_PATH
240275

0 commit comments

Comments
 (0)
Please sign in to comment.