From 6b30b959f6c758d228da82056b08bd7dfaaa2830 Mon Sep 17 00:00:00 2001
From: xiao <K5IFzgsHyFkgN2rl7B04RB+xiao@noreply.cnb.cool>
Date: Sat, 2 Nov 2024 09:14:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 95 ++++++++++++++++++++++++++++--------------------------
 bt.sh      | 10 +++---
 2 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dc8ade3..9b5a849 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,47 +1,50 @@
-FROM debian:bookworm
-
-COPY bt.sh /bt.sh
-
-# 设置构建参数
-ARG RANDOM_NAME
-
-# 设置一个btd12-前缀的随机主机名
-RUN echo "btd12-${RANDOM_NAME}" > /etc/hostname
-
-# 更新包列表
-RUN apt update
-RUN apt upgrade -y
-
-# 安装前置依赖
-RUN apt install -y 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
-
-# 下载并安装宝塔面板
-RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
-    && echo y | bash install_panel.sh -P 8888 --ssl-disable
-
-# 配置宝塔面板安全入口和用户名及密码
-RUN echo btpanel | bt 6 \
-    && echo btpaneldocker | bt 5 \
-    && echo "/btpanel" > /www/server/panel/data/admin_path.pl
-
-# 设置 root 用户密码
-RUN echo "root:btpaneldocker" | chpasswd
-
-# 赋予 bt.sh 可执行权限
-RUN chmod +x /bt.sh
-
-# 清理缓存
-RUN apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# 设置标识文件
-RUN echo "dk_lib_test_d12" > /www/server/panel/data/o.pl
-
-ENTRYPOINT ["/bin/sh","-c","/bt.sh"]
-
-# 暴漏所有端口
-EXPOSE 0-65535
-
-# 健康检查
+FROM debian:bookworm
+
+COPY bt.sh /bt.sh
+
+# 转换 bt.sh 文件的换行符
+RUN dos2unix /bt.sh
+
+# 设置构建参数
+ARG RANDOM_NAME
+
+# 设置一个btd12-前缀的随机主机名
+RUN echo "btd12-${RANDOM_NAME}" > /etc/hostname
+
+# 更新包列表
+RUN apt update
+RUN apt upgrade -y
+
+# 安装前置依赖
+RUN apt install -y 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
+
+# 下载并安装宝塔面板
+RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
+    && echo y | bash install_panel.sh -P 8888 --ssl-disable
+
+# 配置宝塔面板安全入口和用户名及密码
+RUN echo btpanel | bt 6 \
+    && echo btpaneldocker | bt 5 \
+    && echo "/btpanel" > /www/server/panel/data/admin_path.pl
+
+# 设置 root 用户密码
+RUN echo "root:btpaneldocker" | chpasswd
+
+# 赋予 bt.sh 可执行权限
+RUN chmod +x /bt.sh
+
+# 清理缓存
+RUN apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# 设置标识文件
+RUN echo "dk_lib_test_d12" > /www/server/panel/data/o.pl
+
+ENTRYPOINT ["/bin/sh","-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
\ No newline at end of file
diff --git a/bt.sh b/bt.sh
index 9807f88..7a17264 100644
--- a/bt.sh
+++ b/bt.sh
@@ -1,5 +1,5 @@
-/etc/init.d/bt restart
-pkill crond
-/sbin/crond
-/usr/sbin/sshd -D &
-tail -f /dev/null
+/etc/init.d/bt restart
+pkill crond
+/sbin/crond
+/usr/sbin/sshd -D &
+tail -f /dev/null
\ No newline at end of file