|
|
@@ -710,14 +710,6 @@ install_trojan_panel_core() {
|
|
|
read -r -p "请输入数据库的用户表名称(默认:account): " account_table
|
|
|
[[ -z "${account_table}" ]] && account_table="account"
|
|
|
|
|
|
- if [[ "${mariadb_ip}" == "trojan-panel-mariadb" ]]; then
|
|
|
- docker exec trojan-panel-mariadb mysql -p"${mariadb_pas}" -e "drop database trojan_panel_db;" &&
|
|
|
- docker exec trojan-panel-mariadb mysql -p"${mariadb_pas}" -e "create database trojan_panel_db;"
|
|
|
- else
|
|
|
- docker exec trojan-panel-mariadb mysql -h"${mariadb_ip}" -P"${mariadb_port}" -u"${mariadb_user}" -p"${mariadb_pas}" -e "drop database trojan_panel_db;" &>/dev/null &&
|
|
|
- docker exec trojan-panel-mariadb mysql -h"${mariadb_ip}" -P"${mariadb_port}" -u"${mariadb_user}" -p"${mariadb_pas}" -e "create database trojan_panel_db;" &>/dev/null
|
|
|
- fi
|
|
|
-
|
|
|
read -r -p "请输入Redis的IP地址(默认:本机Redis): " redis_host
|
|
|
[[ -z "${redis_host}" ]] && redis_host="trojan-panel-redis"
|
|
|
read -r -p "请输入Redis的端口(默认:本机Redis端口): " redis_port
|
|
|
@@ -729,15 +721,12 @@ install_trojan_panel_core() {
|
|
|
break
|
|
|
fi
|
|
|
done
|
|
|
- if [[ "${mariadb_ip}" == "trojan-panel-redis" ]]; then
|
|
|
- docker exec trojan-panel-redis redis-cli -a "${redis_pass}" -e "flushall" &>/dev/null
|
|
|
- else
|
|
|
- docker exec trojan-panel-redis redis-cli -h "${redis_host}" -p ${redis_port} -a "${redis_pass}" -e "flushall" &>/dev/null
|
|
|
- fi
|
|
|
+
|
|
|
docker pull jonssonyan/trojan-panel-core &&
|
|
|
docker run -d --name trojan-panel-core --restart always \
|
|
|
--network=trojan-panel-network \
|
|
|
- -p 9000-10000:9000-10000 \
|
|
|
+ -p 443:443 \
|
|
|
+ -p 8100:8100 \
|
|
|
-v ${TROJAN_PANEL_CORE_LOGS}:${TROJAN_PANEL_CORE_LOGS} \
|
|
|
-v /etc/localtime:/etc/localtime \
|
|
|
-e "mariadb_ip=${mariadb_ip}" \
|
jonssonyan