Update

oneclickvirt · Nov 18, 2024 · e58da9e · e58da9e
1 parent 651bbb9
commit e58da9e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ FROM alpine:latest
 
 # 安装必要的工具
 RUN apk add --no-cache wget curl bash
-RUN apk add  --no-cache bind-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk add --no-cache bind-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache grep openssl ca-certificates uuidgen
 RUN export noninteractive=true
 # 下载并执行 goecs.sh 脚本

diff --git a/goecs.sh b/goecs.sh
@@ -263,8 +263,35 @@ InstallSysbench() {
             pacman -S --needed --noconfirm sysbench && pacman -S --needed --noconfirm libaio && ldconfig ;;
         freebsd) 
             pkg install -y sysbench ;;
-        alpinelinux) 
-            echo -e "${Msg_Warning}Sysbench Module not found, installing ..." && echo -e "${Msg_Warning}SysBench Current not support Alpine Linux, Skipping..." && Var_Skip_SysBench="1" ;;
+        alpinelinux)
+            if [ "$noninteractive" != "true" ]; then
+                reading "Do you want to continue with sysbench installation? (y/N): " confirm
+                if [[ ! $confirm =~ ^[Yy]$ ]]; then
+                    _yellow "Skipping sysbench installation"
+                    return 1
+                fi
+            fi
+            ALPINE_VERSION=$(grep -o '^[0-9]\+\.[0-9]\+' /etc/alpine-release)
+            COMMUNITY_REPO="http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community"
+            if grep -q "^${COMMUNITY_REPO}" /etc/apk/repositories; then
+                echo "Community repository is already enabled."
+            else
+                echo "Enabling community repository..."
+                echo "${COMMUNITY_REPO}" >> /etc/apk/repositories
+                echo "Community repository has been added."
+                echo "Updating apk package index..."
+                apk update && echo "Package index updated successfully."
+            fi
+            if apk info sysbench >/dev/null 2>&1; then
+                echo -e "${Msg_Info}Sysbench already installed."
+            else
+                apk add --no-cache sysbench
+                if [ $? -ne 0 ]; then
+                    echo -e "${Msg_Warning}Sysbench Module not found, installing ..." && echo -e "${Msg_Warning}SysBench Current not support Alpine Linux, Skipping..." && Var_Skip_SysBench="1"
+                else
+                    echo -e "${Msg_Success}Sysbench installed successfully."
+                fi
+            fi ;;
         *) 
             _red "Sysbench Install Error: Unknown OS release: $Var_OSRelease" ;;
         esac
@@ -345,7 +372,7 @@ env_check() {
     REGEX=("debian|astra" "ubuntu" "centos|red hat|kernel|oracle linux|alma|rocky" "'amazon linux'" "fedora" "arch" "freebsd" "alpine" "openbsd" "opencloudos")
     RELEASE=("Debian" "Ubuntu" "CentOS" "CentOS" "Fedora" "Arch" "FreeBSD" "Alpine" "OpenBSD" "OpenCloudOS")
     PACKAGE_UPDATE=("apt-get update" "apt-get update" "yum -y update" "yum -y update" "yum -y update" "yum -y update" "pacman -Sy" "pkg update" "apk update" "yum -y update")
-    PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add" "yum -y install")
+    PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add --no-cache" "yum -y install")
     PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm" "pkg delete" "apk del" "yum -y remove")
     PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "pacman -Rns --noconfirm" "pkg autoremove" "apk autoremove" "yum -y autoremove")
     # 检查系统信息