Browse Source

install unzip when redhat9

qiaofeng1227 2 năm trước cách đây
mục cha
commit
b55c68ceea

+ 1 - 0
CHANGELOG.md

@@ -2,6 +2,7 @@
 
 
 1. appstore 升级脚本输出内容过多引起的异常修复
 1. appstore 升级脚本输出内容过多引起的异常修复
 2. 安装脚本对于 yq 失败的异常处理
 2. 安装脚本对于 yq 失败的异常处理
+3. 对部分操作系统(如 redhat9)安装 unzip 包
 
 
 ## 0.4.0 release on 2023-06-15
 ## 0.4.0 release on 2023-06-15
 
 

+ 1 - 1
appmanage/Dockerfile

@@ -10,7 +10,7 @@ COPY static ./static
 COPY requirements.txt main.py  ./
 COPY requirements.txt main.py  ./
 RUN apt update
 RUN apt update
 
 
-# Install supervisords
+# Install supervisord
 RUN apt install -y supervisor
 RUN apt install -y supervisor
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY config/cmd.sh /cmd.sh
 COPY config/cmd.sh /cmd.sh

+ 1 - 1
appmanage/api/service/manage.py

@@ -59,7 +59,7 @@ def AppStoreUpdate():
         for change in change_log[1:]:
         for change in change_log[1:]:
             if change != '':
             if change != '':
                 content.append(change)
                 content.append(change)
-        shell_execute.execute_command_output_all("wget curl https://websoft9.github.io/StackHub/install/update_appstore.sh && bash update_appstore.sh 1>/dev/null 2>&1")
+        shell_execute.execute_command_output_all("wget https://websoft9.github.io/StackHub/install/update_appstore.sh && bash update_appstore.sh 1>/dev/null 2>&1")
         
         
         return content
         return content
     else:
     else:

+ 2 - 2
install/install.sh

@@ -134,7 +134,7 @@ echo "Prepare to install Tools ..."
 
 
 if [ "$os_type" == 'CentOS' ] || [ "$os_type" == 'CentOS Stream' ]  || [ "$os_type" == 'Fedora' ] || [ "$os_type" == 'OracleLinux' ] || [ "$os_type" == 'Redhat' ];then
 if [ "$os_type" == 'CentOS' ] || [ "$os_type" == 'CentOS Stream' ]  || [ "$os_type" == 'Fedora' ] || [ "$os_type" == 'OracleLinux' ] || [ "$os_type" == 'Redhat' ];then
   sudo yum update -y 1>/dev/null 2>&1
   sudo yum update -y 1>/dev/null 2>&1
-  sudo yum install  git curl wget yum-utils jq firewalld bc -y  1>/dev/null 2>&1
+  sudo yum install  git curl wget yum-utils jq firewalld bc unzip -y  1>/dev/null 2>&1
 
 
 fi
 fi
 
 
@@ -144,7 +144,7 @@ if [ "$os_type" == 'Ubuntu' ] || [ "$os_type" == 'Debian' ] ;then
       sleep 5
       sleep 5
   done
   done
   sudo apt update -y 1>/dev/null 2>&1
   sudo apt update -y 1>/dev/null 2>&1
-  sudo apt install git curl wget jq firewalld bc -y  1>/dev/null 2>&1
+  sudo apt install git curl wget jq firewalld bc unzip -y  1>/dev/null 2>&1
 fi
 fi
 
 
 }
 }