fix: 修复健康检查命令以支持 HTTPS

在 bt.sh 脚本中，已进行以下修改：
1. 将 `/sbin/crond` 更新为 `/usr/sbin/crond`，以确保使用正确的 crond 路径。
2. 新增 `ssh-keygen -A` 命令，用于生成 SSH 密钥对，增强系统安全性。
这些修改旨在提升脚本的稳定性和安全性。

.cnb.yml

@@ -5,17 +5,17 @@ $:
       docker:
         build: 
           dockerfile: .ide/Dockerfile
+rockylinux9:
   push:
     - runner:
         tags: cnb:arch:amd64
       services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:latest_debian12-linux-amd64
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}-linux-amd64
       stages:
         - name: docker login
-          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
+          script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
         - name: docker build
           script: docker build -t ${IMAGE_TAG} .
         - name: docker push
@@ -27,15 +27,16 @@ $:
           
     - runner:
         tags: cnb:arch:arm64:v8
+        cpus: 16
       services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:latest_debian12-linux-arm64
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}-linux-arm64
       stages:
         - name: docker login
-          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
+          script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
         - name: docker build
+          timeout: 3600s
           script: docker build -t ${IMAGE_TAG} .
         - name: docker push
           script: docker push ${IMAGE_TAG}
@@ -43,12 +44,13 @@ $:
           type: cnb:resolve
           options:
             key: build-arm64
-
+    - runner:
-    - services:
+        tags: cnb:arch:amd64
+        cpus: 2
+      services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:latest_debian12
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}
       stages:
         - name: await the amd64
           type: cnb:await
@@ -61,8 +63,8 @@ $:
         - name: manifest
           image: cnbcool/manifest
           settings:
-            username: $DOCKER_USERNAME
+            username: $CNB_TOKEN_USER_NAME
-            password: $DOCKER_PASSWD
+            password: $CNB_TOKEN
             target: ${IMAGE_TAG}
             template: ${IMAGE_TAG}-OS-ARCH
             platforms:

Dockerfile

@@ -1,19 +1,21 @@
-FROM debian:bookworm
+FROM rockylinux:9
 
-# 切换 Debian 镜像源为腾讯云源，更新包列表并安装依赖
+# 设置构建参数
-RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \
+ARG RANDOM_NAME
-    && apt update && apt upgrade -y \
+
-    && apt install -y \
+# 设置一个随机主机名
-    locales \
+RUN echo "btr9-${RANDOM_NAME}" > /etc/hostname
-    wget iproute2 openssh-server libgd-dev cmake make gcc g++ autoconf \
+
-    libsodium-dev libonig-dev libssh2-1-dev libc-ares-dev libaio-dev sudo curl dos2unix \
+# 切换 rockylinux 镜像源为腾讯云源，更新包列表并安装依赖
-    build-essential re2c cron bzip2 libzip-dev libc6-dev bison file rcconf flex vim m4 gawk less cpp binutils \
+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 && \
-    diffutils unzip tar libbz2-dev libncurses5 libncurses5-dev libtool libevent-dev libssl-dev libsasl2-dev \
+    dnf makecache && \
-    libltdl-dev zlib1g-dev libglib2.0-0 libglib2.0-dev libkrb5-dev libpq-dev libpq5 gettext libcap-dev \
+    (dnf install -y epel-release || dnf install -y epol-release 'dnf-command(config-manager)') && \
-    libc-client2007e-dev psmisc patch git e2fsprogs libxslt1-dev xz-utils libgd3 libwebp-dev libvpx-dev \
+    (dnf config-manager --set-enabled powertools || dnf config-manager --set-enabled crb) || true && \
-    libfreetype6-dev libjpeg62-turbo libjpeg62-turbo-dev iptables libudev-dev libldap2-dev \
+    dnf repolist && \
-    && apt clean \
+    dnf update -y && \
-    && rm -rf /var/lib/apt/lists/* 
+    dnf install -y cronie perl perl-devel procps-ng which glibc-locale-source util-linux wget iproute openssh-server gd-devel cmake make gcc gcc-c++ autoconf libsodium-devel oniguruma libssh2-devel c-ares-devel libaio-devel sudo 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", "/"]
@@ -25,10 +27,10 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
 RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
     && echo y | bash install_panel.sh -P 8888 --ssl-disable \
     && rm -rf /www/server/data/* \
-    && echo "docker_bt_d12" > /www/server/panel/data/o.pl \
+    && echo "docker_bt_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 \
-    && apt clean \
+    && dnf clean all \
-    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /var/cache/dnf \
     && chmod +x /bt.sh \
     && chmod +x /init_mysql.sh
     
@@ -39,10 +41,10 @@ RUN echo btpanel | bt 6 \
     && echo "/btpanel" > /www/server/panel/data/admin_path.pl \
     && echo "root:btpaneldocker" | chpasswd
 
-ENTRYPOINT ["/bin/sh","-c","/bt.sh"]
+ENTRYPOINT ["/bin/bash","-c","/bt.sh"]
 
 # 暴漏所有端口
 EXPOSE 0-65535
 
 # 健康检查
-HEALTHCHECK --interval=5s --timeout=3s CMD curl -i http://127.0.0.1:$(cat /www/server/panel/data/port.pl)$(cat /www/server/panel/data/admin_path.pl) | grep -E '(200|404)' || exit 1
+HEALTHCHECK --interval=5s --timeout=3s CMD prot="http"; if [ -f "/www/server/panel/data/ssl.pl" ]; then prot="https"; fi; curl -k -i $prot://127.0.0.1:$(cat /www/server/panel/data/port.pl)$(cat /www/server/panel/data/admin_path.pl) | grep -E '(200|404)' || exit 1

bt.sh

@@ -31,14 +31,15 @@ soft_start(){
     ${init_path}/bt start
 
     pkill crond
-    /sbin/crond
+    /usr/sbin/crond
-
+    
+    ssh-keygen -A
     chmod 600 /etc/ssh/ssh_host_*
-    /usr/sbin/sshd -D &
+    /usr/sbin/sshd  &
 }
 
 init_mysql(){
-    if [ "${O_pl}" != "docker_btlamp_d12" ] && [ "${O_pl}" != "docker_btlnmp_d12" ];then
+    if [ "${O_pl}" != "docker_btlamp_r9" ] && [ "${O_pl}" != "docker_btlnmp_r9" ];then
         return
     fi
     if [ -d "${Data_Path}" ]; then
@@ -51,7 +52,7 @@ init_mysql(){
         fi
     fi
     if [ -f /init_mysql.sh ] && [ -d "${Setup_Path}" ];then
-        sh /init_mysql.sh
+        bash /init_mysql.sh
         rm -f /init_mysql.sh
     fi
 }