From c63a313334206356faba83771c611b98faf78a83 Mon Sep 17 00:00:00 2001
From: xiao <K5IFzgsHyFkgN2rl7B04RB+xiao@noreply.cnb.cool>
Date: Wed, 4 Dec 2024 19:18:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20Dockerfile=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20dnf=20=E6=9B=BF=E4=BB=A3=20yum=20=E5=B9=B6?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E7=BC=93=E5=AD=98=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6badfc7..abb37a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,23 +3,23 @@ FROM rockylinux:9
 # 切换 rockylinux 镜像源为腾讯云源，更新包列表并安装依赖
 RUN sed -e 's|^mirrorlist=|#mirrorlist=|g' \
     -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.tencent.com/rocky|g' \
-    -i.bak \
-    /etc/yum.repos.d/rocky-*.repo \
-    && yum makecache \
-    && yum update -y \
-    && yum install -y yum-utils epel-release \
-    && yum config-manager --set-enabled devel \
-    && yum config-manager --set-enabled epel \
-    && yum install -y \
-    glibc-locale-source \
-    wget iproute openssh-server gd-devel cmake make gcc gcc-c++ autoconf \
-    libsodium-devel oniguruma libssh2-devel c-ares-devel libaio-devel sudo curl dos2unix \
-    bzip2 zip unzip tar ncurses-devel libtool libevent-devel openssl-devel cyrus-sasl-devel \
-    libtool-libs zlib-devel glib2 glib2-devel krb5-devel postgresql-devel gettext libcap-devel \
-    oniguruma-devel psmisc patch git e2fsprogs libxslt-devel xz libwebp-devel libvpx-devel \
-    freetype-devel libjpeg-turbo libjpeg-turbo-devel iptables systemd-devel openldap-devel \
-    && yum clean all \
-    && rm -rf /var/cache/yum
+    -i.bak /etc/yum.repos.d/rocky-*.repo \
+    && dnf makecache \
+    && dnf update -y \
+    && dnf install -y dnf-plugins-core epel-release \
+    && dnf config-manager --set-enabled devel \
+    && dnf config-manager --set-enabled epel \
+    && dnf remove -y curl-minimal \
+    && dnf install -y \
+        glibc-locale-source \
+        wget iproute openssh-server gd-devel cmake make gcc gcc-c++ autoconf \
+        libsodium-devel oniguruma libssh2-devel c-ares-devel libaio-devel sudo curl dos2unix \
+        bzip2 zip unzip tar ncurses-devel libtool libevent-devel openssl-devel cyrus-sasl-devel \
+        libtool-libs zlib-devel glib2 glib2-devel krb5-devel postgresql-devel gettext libcap-devel \
+        oniguruma-devel psmisc patch git e2fsprogs libxslt-devel xz libwebp-devel libvpx-devel \
+        freetype-devel libjpeg-turbo libjpeg-turbo-devel iptables systemd-devel openldap-devel \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf
 
 # 复制脚本
 COPY ["bt.sh", "init_mysql.sh", "/"]
@@ -46,13 +46,12 @@ RUN curl -o /lamp/apache.sh https://download.bt.cn/install/0/apache.sh \
     && rm -rf /www/server/mysql/src \
     && rm -rf /www/server/data/* \
     && rm -rf /www/server/apache/src \
-    && echo "docker_btlamp_c79" > /www/server/panel/data/o.pl \
+    && echo "docker_btlamp_r9" > /www/server/panel/data/o.pl \
     && echo '["memuA", "memuAsite", "memuAdatabase", "memuAcontrol", "memuAfiles", "memuAlogs", "memuAxterm", "memuAcrontab", "memuAsoft", "memuAconfig", "dologin", "memu_btwaf", "memuAssl"]' > /www/server/panel/config/show_menu.json \
-    && yum clean all \
-    && rm -rf /var/cache/yum \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf \
     && chmod +x /bt.sh \
     && chmod +x /init_mysql.sh
-    
 
 # 配置宝塔面板安全入口和用户名及密码，以及 SSH 密码
 RUN echo btpanel | bt 6 \