jonssonyan 3 年之前
父节点
当前提交
6ca340a11f
共有 2 个文件被更改,包括 11 次插入11 次删除
  1. 6 6
      install_script.sh
  2. 5 5
      install_script_standalone.sh

+ 6 - 6
install_script.sh

@@ -863,7 +863,7 @@ update_trojan_panel_core() {
 # 卸载Caddy TLS
 uninstall_caddy_tls() {
   # 判断Caddy TLS是否安装
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-caddy$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-caddy$") ]]; then
     echo_content green "---> 卸载Caddy TLS"
 
     docker rm -f trojan-panel-caddy &&
@@ -878,7 +878,7 @@ uninstall_caddy_tls() {
 # 卸载MariaDB
 uninstall_mariadb() {
   # 判断MariaDB是否安装
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-mariadb$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-mariadb$") ]]; then
     echo_content green "---> 卸载MariaDB"
 
     docker rm -f trojan-panel-mariadb &&
@@ -893,7 +893,7 @@ uninstall_mariadb() {
 # 卸载Redis
 uninstall_redis() {
   # 判断Redis是否安装
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-redis$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-redis$") ]]; then
     echo_content green "---> 卸载Redis"
 
     docker rm -f trojan-panel-redis &&
@@ -908,7 +908,7 @@ uninstall_redis() {
 # 卸载Trojan Panel
 uninstall_trojan_panel() {
   # 判断Trojan Panel是否安装
-  if [[ -n $(docker ps -q -f "name=^trojan-panel$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel$") ]]; then
     echo_content green "---> 卸载Trojan Panel"
 
     docker rm -f trojan-panel &&
@@ -929,7 +929,7 @@ uninstall_trojan_panel() {
 # 卸载Trojan Panel Core
 uninstall_trojan_panel_core() {
   # 判断Trojan Panel Core是否安装
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-core$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-core$") ]]; then
     echo_content green "---> 卸载Trojan Panel Core"
 
     docker rm -f trojan-panel-core &&
@@ -946,7 +946,7 @@ uninstall_trojan_panel_core() {
 uninstall_all() {
   echo_content green "---> 卸载全部Trojan Panel相关的容器"
 
-  docker rm -f "$(docker ps -q -f "name=^trojan-panel")" &&
+  docker rm -f "$(docker ps -a -q -f "name=^trojan-panel")" &&
     docker rmi -f "$(docker images | grep "^jonssonyan/trojan-panel" | awk '{print $3}')" &&
     rm -rf ${TP_DATA}
 

+ 5 - 5
install_script_standalone.sh

@@ -741,7 +741,7 @@ EOF
 # 卸载Caddy TLS
 uninstall_caddy_tls() {
   # 判断Caddy TLS是否安装
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-caddy$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-caddy$") ]]; then
     echo_content green "---> 卸载Caddy TLS"
 
     docker rm -f trojan-panel-caddy &&
@@ -755,7 +755,7 @@ uninstall_caddy_tls() {
 
 # 卸载TrojanGFW 单机版
 uninstall_trojan_gfw_standalone() {
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-trojanGFW-standalone$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-trojanGFW-standalone$") ]]; then
     echo_content green "---> 卸载TrojanGFW 单机版"
 
     docker rm -f trojan-panel-trojanGFW-standalone &&
@@ -770,7 +770,7 @@ uninstall_trojan_gfw_standalone() {
 
 # 卸载TrojanGO 单机版
 uninstall_trojanGO_standalone() {
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-trojanGO-standalone$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-trojanGO-standalone$") ]]; then
     echo_content green "---> 卸载TrojanGO 单机版"
 
     docker rm -f trojan-panel-trojanGO-standalone &&
@@ -785,7 +785,7 @@ uninstall_trojanGO_standalone() {
 
 # 卸载Hysteria节点 单机版
 uninstall_hysteria_standalone() {
-  if [[ -n $(docker ps -q -f "name=^trojan-panel-hysteria-standalone$") ]]; then
+  if [[ -n $(docker ps -a -q -f "name=^trojan-panel-hysteria-standalone$") ]]; then
     echo_content green "---> 卸载Hysteria节点 单机版"
 
     docker rm -f trojan-panel-hysteria-standalone &&
@@ -802,7 +802,7 @@ uninstall_hysteria_standalone() {
 uninstall_all() {
   echo_content green "---> 卸载全部Trojan Panel相关的容器"
 
-  docker rm -f "$(docker ps -q -f "name=^trojan-panel")" &&
+  docker rm -f "$(docker ps -a -q -f "name=^trojan-panel")" &&
     docker rmi -f "$(docker images | grep "^trojan-panel" | awk '{print $3}')" &&
     rm -rf ${TP_DATA}