From b9b3b9fedf9736ce2157704d95026ea808c9acb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Tue, 11 Jun 2024 02:03:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E5=86=8D=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85podman?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install_panel.sh |  6 ++----
 scripts/update_panel.sh  | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh
index f168cbbe..b6a5b7c3 100644
--- a/scripts/install_panel.sh
+++ b/scripts/install_panel.sh
@@ -150,14 +150,14 @@ Prepare_System() {
         # Rocky Linux
         /usr/bin/crb enable
         dnf makecache -y
-        dnf install -y curl wget zip unzip tar p7zip p7zip-plugins git jq git-core dos2unix podman rsyslog
+        dnf install -y curl wget zip unzip tar p7zip p7zip-plugins git jq git-core dos2unix rsyslog
     elif [ "${OS}" == "debian" ]; then
         if ${inChina}; then
             sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list
             sed -i 's/security.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list
         fi
         apt-get update -y
-        apt-get install -y curl wget zip unzip tar p7zip p7zip-full git jq git dos2unix podman rsyslog
+        apt-get install -y curl wget zip unzip tar p7zip p7zip-full git jq git dos2unix rsyslog
     fi
     if [ "$?" != "0" ]; then
         echo -e $HR
@@ -166,9 +166,7 @@ Prepare_System() {
     fi
 
     systemctl enable rsyslog
-    systemctl enable podman
     systemctl start rsyslog
-    systemctl start podman
     if [ "$?" != "0" ]; then
         echo -e $HR
         echo "错误：安装面板依赖软件失败，请截图错误信息寻求帮助。"
diff --git a/scripts/update_panel.sh b/scripts/update_panel.sh
index c24f169f..8f5a7717 100644
--- a/scripts/update_panel.sh
+++ b/scripts/update_panel.sh
@@ -86,21 +86,6 @@ if version_lt "$oldVersion" "2.1.30"; then
     openssl req -x509 -nodes -days 36500 -newkey ec:<(openssl ecparam -name secp384r1) -keyout $panelPath/storage/ssl.key -out $panelPath/storage/ssl.crt -subj "/C=CN/ST=Tianjin/L=Tianjin/O=HaoZi Technology Co., Ltd./OU=HaoZi Panel/CN=Panel"
 fi
 
-if version_lt "$oldVersion" "2.1.39"; then
-    echo "更新面板到 v2.1.39 ..."
-    echo "Update panel to v2.1.39 ..."
-    if [ "${OS}" == "centos" ]; then
-        dnf makecache
-        dnf install -y podman
-    else
-        apt-get update -y
-        apt-get install -y podman
-    fi
-
-    systemctl enable podman
-    systemctl start podman
-fi
-
 if version_lt "$oldVersion" "2.2.0"; then
     echo "更新面板到 v2.2.0 ..."
     echo "Update panel to v2.2.0 ..."