Compare commits

...

11 Commits

Author SHA1 Message Date
xiao
df688d5729 chore: update .cnb.yml to add platform and clear task 2025-03-08 16:43:52 +08:00
xiao
1886bf0837 chore: 在 Dockerfile 中添加 ca-certificates 包以增强安全性 2025-03-08 15:30:49 +08:00
xiao
86487a8f3b chore: update Dockerfile to package BT Panel and clean www directory 2025-03-08 15:21:10 +08:00
xiao
5d4efb5e1c fix: 修改备份数据库时间戳格式为 Unix 时间戳
将备份数据库函数中的时间戳格式从 `%Y%m%d%H%M%S` 修改为 Unix 时间戳 `%s`,保证时间戳的唯一性和标准化。
2025-01-07 16:09:54 +08:00
xiao
e7fe4f239f chore: 添加数据库备份功能 2025-01-07 14:24:56 +08:00
xiao
1ad37cbb49 chore: 修改 Dockerfile 中的端口暴露和健康检查设置 2024-12-21 09:26:31 +08:00
xiao
4351cf8cbd refactor: 更新 Docker 镜像构建和推送流程 2024-11-26 11:04:39 +08:00
xiao
b02c18b40c feat: 更新系统标识 2024-11-25 12:36:55 +08:00
xiao
4f747761a5 chore: 更新构建配置以支持 bullseye 架构 2024-11-25 12:09:47 +08:00
xiao
1512ace87e build: 更新 Dockerfile 使用 Debian bullseye 版本并修正镜像源路径 2024-11-25 12:09:12 +08:00
xiao
9c36b27ca9 refactor: 更新 docker 构建和推送流程
优化了 docker 构建和推送流程,使用环境变量替代硬编码的镜像标签和凭证,增加了构建超时设置,并为 arm64
2024-11-25 12:07:11 +08:00
3 changed files with 46 additions and 12 deletions

View File

@ -12,7 +12,7 @@ $:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:latest_debian12-linux-amd64 IMAGE_TAG: btpanel/baota:latest_debian11-linux-amd64
stages: stages:
- name: docker login - name: docker login
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
@ -31,7 +31,7 @@ $:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:latest_debian12-linux-arm64 IMAGE_TAG: btpanel/baota:latest_debian11-linux-arm64
stages: stages:
- name: docker login - name: docker login
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
@ -48,7 +48,7 @@ $:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:latest_debian12 IMAGE_TAG: btpanel/baota:latest_debian11
stages: stages:
- name: await the amd64 - name: await the amd64
type: cnb:await type: cnb:await
@ -68,3 +68,12 @@ $:
platforms: platforms:
- linux/amd64 - linux/amd64
- linux/arm64 - linux/arm64
- name: clear
image: lumir/remove-dockerhub-tag
args:
- --user
- $DOCKER_USERNAME
- --password
- $DOCKER_PASSWD
- ${IMAGE_TAG}-linux-amd64
- ${IMAGE_TAG}-linux-arm64

View File

@ -1,11 +1,11 @@
FROM debian:bookworm FROM debian:bullseye
# 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖 # 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖
RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
&& apt update && apt upgrade -y \ && apt update && apt upgrade -y \
&& apt install -y \ && apt install -y \
locales \ locales \
wget iproute2 openssh-server libgd-dev cmake make gcc g++ autoconf \ wget iproute2 openssh-server libgd-dev cmake make gcc g++ autoconf ca-certificates \
libsodium-dev libonig-dev libssh2-1-dev libc-ares-dev libaio-dev sudo curl dos2unix \ libsodium-dev libonig-dev libssh2-1-dev libc-ares-dev libaio-dev sudo curl dos2unix \
build-essential re2c cron bzip2 libzip-dev libc6-dev bison file rcconf flex vim m4 gawk less cpp binutils \ build-essential re2c cron bzip2 libzip-dev libc6-dev bison file rcconf flex vim m4 gawk less cpp binutils \
diffutils unzip tar libbz2-dev libncurses5 libncurses5-dev libtool libevent-dev libssl-dev libsasl2-dev \ diffutils unzip tar libbz2-dev libncurses5 libncurses5-dev libtool libevent-dev libssl-dev libsasl2-dev \
@ -25,7 +25,7 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
&& echo y | bash install_panel.sh -P 8888 --ssl-disable \ && echo y | bash install_panel.sh -P 8888 --ssl-disable \
&& rm -rf /www/server/data/* \ && rm -rf /www/server/data/* \
&& echo "docker_bt_d12" > /www/server/panel/data/o.pl \ && echo "docker_bt_d11" > /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 \ && echo '["memuA", "memuAsite", "memuAdatabase", "memuAcontrol", "memuAfiles", "memuAlogs", "memuAxterm", "memuAcrontab", "memuAsoft", "memuAconfig", "dologin", "memu_btwaf", "memuAssl"]' > /www/server/panel/config/show_menu.json \
&& apt clean \ && apt clean \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
@ -39,10 +39,15 @@ RUN echo btpanel | bt 6 \
&& echo "/btpanel" > /www/server/panel/data/admin_path.pl \ && echo "/btpanel" > /www/server/panel/data/admin_path.pl \
&& echo "root:btpaneldocker" | chpasswd && echo "root:btpaneldocker" | chpasswd
# 打包宝塔面板并清除www
RUN bt 2 \
&& tar -zcf /www.tar.gz /www \
&& rm -rf /www
ENTRYPOINT ["/bin/sh","-c","/bt.sh"] ENTRYPOINT ["/bin/sh","-c","/bt.sh"]
# 暴漏所有端口 # 暴漏特定端口
EXPOSE 0-65535 EXPOSE 22 80 443 888 3306 8888
# 健康检查 # 健康检查
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

22
bt.sh
View File

@ -8,6 +8,24 @@ Setup_Path=$Root_Path/server/mysql
Data_Path=$Root_Path/server/data Data_Path=$Root_Path/server/data
O_pl=$(cat /www/server/panel/data/o.pl) O_pl=$(cat /www/server/panel/data/o.pl)
backup_database() {
if [ -d "${Data_Path}" ] && [ ! -z "$(ls -A ${Data_Path})" ]; then
if [ ! -d "${Setup_Path}" ] || [ -z "$(ls -A ${Setup_Path})" ]; then
timestamp=$(date +"%s")
tar czf /www/server/data_backup_$timestamp.tar.gz -C ${Data_Path} .
fi
fi
}
restore_panel_data() {
if [ -f /www.tar.gz ]; then
if [ ! -d /www ] || [ -z "$(ls -A /www)" ] || [ ! -d /www/server/panel ] || [ -z "$(ls -A /www/server/panel)" ] || [ ! -d /www/server/panel/pyenv ] || [ -z "$(ls -A /www/server/panel/pyenv)" ]; then
tar xzf /www.tar.gz -C / --skip-old-files
rm -rf /www.tar.gz
fi
fi
}
soft_start(){ soft_start(){
# 扫描并启动所有服务 # 扫描并启动所有服务
init_scripts=$(ls ${init_path}) init_scripts=$(ls ${init_path})
@ -38,7 +56,7 @@ soft_start(){
} }
init_mysql(){ init_mysql(){
if [ "${O_pl}" != "docker_btlamp_d12" ] && [ "${O_pl}" != "docker_btlnmp_d12" ];then if [ "${O_pl}" != "docker_btlamp_d11" ] && [ "${O_pl}" != "docker_btlnmp_d11" ];then
return return
fi fi
if [ -d "${Data_Path}" ]; then if [ -d "${Data_Path}" ]; then
@ -68,6 +86,8 @@ start_mysql(){
fi fi
} }
restore_panel_data > /dev/null
backup_database > /dev/null
is_empty_Data > /dev/null is_empty_Data > /dev/null
init_mysql > /dev/null init_mysql > /dev/null
start_mysql > /dev/null start_mysql > /dev/null