|
|
@@ -271,7 +271,7 @@ EOF
|
|
|
fi
|
|
|
|
|
|
systemctl enable docker &&
|
|
|
- systemctl restart docker &&
|
|
|
+ systemctl restart docker
|
|
|
|
|
|
if [[ $(docker -v 2>/dev/null) ]]; then
|
|
|
echo_content skyBlue "---> Docker安装完成"
|
|
|
@@ -671,9 +671,10 @@ install_trojan_panel_core() {
|
|
|
docker pull jonssonyan/trojan-panel-core &&
|
|
|
docker run -d --name trojan-panel-core --restart always \
|
|
|
--network=host \
|
|
|
+ -v ${TROJAN_PANEL_CORE_DATA}bin:${TROJAN_PANEL_CORE_DATA}bin \
|
|
|
-v ${TROJAN_PANEL_CORE_LOGS}:${TROJAN_PANEL_CORE_LOGS} \
|
|
|
- -v /etc/localtime:/etc/localtime \
|
|
|
-v ${CADDY_ACME}:${CADDY_ACME} \
|
|
|
+ -v /etc/localtime:/etc/localtime \
|
|
|
-e "mariadb_ip=${mariadb_ip}" \
|
|
|
-e "mariadb_port=${mariadb_port}" \
|
|
|
-e "mariadb_user=${mariadb_user}" \
|
|
|
@@ -837,7 +838,9 @@ update_trojan_panel_core() {
|
|
|
docker pull jonssonyan/trojan-panel-core &&
|
|
|
docker run -d --name trojan-panel-core --restart always \
|
|
|
--network=host \
|
|
|
+ -v ${TROJAN_PANEL_CORE_DATA}bin:${TROJAN_PANEL_CORE_DATA}bin \
|
|
|
-v ${TROJAN_PANEL_CORE_LOGS}:${TROJAN_PANEL_CORE_LOGS} \
|
|
|
+ -v ${CADDY_ACME}:${CADDY_ACME} \
|
|
|
-v /etc/localtime:/etc/localtime \
|
|
|
-e "mariadb_ip=${mariadb_ip}" \
|
|
|
-e "mariadb_port=${mariadb_port}" \
|
jonssonyan