Compare commits

...

19 Commits
fnos ... main

Author SHA1 Message Date
b21ccb6344 取消国内镜像源 2025-04-01 20:03:43 +08:00
09fb13638e 修改 tags 2 2025-04-01 19:35:56 +08:00
eefc67c34f 修改 tags 2025-04-01 19:33:52 +08:00
2a5d694708 添加工作流 2025-04-01 19:29:29 +08:00
xiao
ec7393435d docs: 更新 README.md 中的 Docker Run 命令示例 2025-03-19 15:53:38 +08:00
xiao
466dccaf9b docs: 修正 Docker Compose 配置中的卷路径 2025-03-19 15:51:40 +08:00
xiao
1622719b66 docs: 修正 Docker 使用部分格式,使其更规范 2025-03-11 18:26:05 +08:00
xiao
b9a3bb1342 优化 Dockerfile 和 bt.sh:打包宝塔面板并清除 www 目录,调整脚本中部分函数执行顺序 2025-03-11 11:25:28 +08:00
yolokk
583e94973a docs: 更新 README.md 添加 Docker 使用参考格式 2025-03-08 16:56:37 +08:00
xiao
b7548bb509 docs: 更新使用说明 2025-01-09 11:31:53 +08:00
xiao
02f02aef88 feat: 添加说明 2025-01-09 11:15:31 +08:00
xiao
71eab61a5d feat: 新增 issue 开启和重新打开时的通知功能 2025-01-09 10:06:37 +08:00
xiao
3306ff3ef3 fix: 将bug报告模板中的报错日志输入框改为文本域以支持多行输入 2025-01-09 09:53:43 +08:00
xiao
5fb61374d0 feat: 优化ISSUE提交体验 2025-01-09 09:50:57 +08:00
xiao
7d64f66acb fix: 修改备份数据库时间戳格式为 Unix 时间戳
将备份数据库函数中的时间戳格式从 `%Y%m%d%H%M%S` 修改为 Unix 时间戳 `%s`,保证时间格式统一且更利于数值计算和处理。
2025-01-07 16:07:09 +08:00
xiao
7704973d73 perf: 优化宝塔面板安装过程,使用腾讯云 PyPI 镜像源 2025-01-07 12:18:47 +08:00
xiao
bcc6565dc2 fix: 修正备份数据库条件判断逻辑 2025-01-07 11:19:46 +08:00
xiao
0237f60bdd feat: 新增数据库备份与恢复功能 2025-01-07 11:07:47 +08:00
xiao
6fb41b2423 Update Dockerfile to expose specific ports and maintain health check support for HTTPS 2024-12-18 15:57:39 +08:00
9 changed files with 209 additions and 4 deletions

View File

@ -5,6 +5,32 @@ $:
docker:
build:
dockerfile: .ide/Dockerfile
issue.open:
- stages:
- name: issue-notice
image: tencentcom/wecom-message
imports: https://cnb.cool/btpanel/secret/-/blob/main/wework-robots.yml
settings:
robot: $CNB_WARRIOR_ROBOT
msgType: markdown
content: |
> **有人提issue啦**
> **标 题:** $CNB_ISSUE_TITLE
> **发起人:** $CNB_ISSUE_OWNER
> **查看:** [$CNB_EVENT_URL]($CNB_EVENT_URL)
issue.reopen:
- stages:
- name: issue-notice
image: tencentcom/wecom-message
imports: https://cnb.cool/btpanel/secret/-/blob/main/wework-robots.yml
settings:
robot: $CNB_WARRIOR_ROBOT
content: |
> **$CNB_BUILD_USER重新打开了一个issue**
> **标 题:** $CNB_ISSUE_TITLE
> **发起人:** $CNB_ISSUE_OWNER
> **查 看:** [$CNB_EVENT_URL]($CNB_EVENT_URL)
push:
- runner:
tags: cnb:arch:amd64

View File

@ -0,0 +1,22 @@
name: feature request
description: 该模版用于提需求
labels:
- feature
body:
- type: markdown
attributes:
value: |
感谢用户提出的改进 宝塔面板Docker镜像 的想法。
请尽可能填写以下内容
- type: textarea
attributes:
label: 这个特性将解决什么问题?
validations:
required: true
- type: textarea
attributes:
label: 设想的解决方案?如有
- type: textarea
attributes:
label: 您考虑过哪些替代方案?如有

View File

@ -0,0 +1,20 @@
name: bug report
description: 该模版用于反馈 bug
labels:
- bug
body:
- type: textarea
attributes:
label: 提供报错说明&截图?如有,可更快的确认问题
validations:
required: true
- type: textarea
attributes:
label: 提供一下报错日志?如环境/插件安装日志,或其他报错信息
validations:
required: false
- type: textarea
attributes:
label: 描述一下重现步骤?
validations:
required: false

View File

@ -0,0 +1,13 @@
name: experience improve
description: 该模版用于反馈体验问题
labels:
- 体验优化
body:
- type: textarea
attributes:
label: 描述一下体验不好的点
validations:
required: true
- type: textarea
attributes:
label: 优化建议?如有

View File

@ -0,0 +1 @@
blank_issues_enabled: true

View File

@ -0,0 +1,38 @@
name: Docker Image Build and Push
on:
workflow_dispatch:
inputs:
version:
description: '版本标签'
required: true
default: '9.5.0'
jobs:
build-and-push-multiarch:
name: Build and Push Multi-Arch Docker Image
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Build and push multi-arch Docker images
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: |
ldxw/btpanel:latest
ldxw/btpanel:${{ github.event.inputs.version }}

View File

@ -1,8 +1,9 @@
FROM debian:bookworm
# 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖
RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \
&& apt update && apt upgrade -y \
RUN #sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \
#&&
apt update && apt upgrade -y \
&& apt install -y \
locales \
wget iproute2 openssh-server libgd-dev cmake make gcc g++ autoconf \
@ -24,6 +25,7 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
# 下载并安装宝塔面板及 lnmp 环境
RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
&& echo y | bash install_panel.sh -P 8888 --ssl-disable \
#&& btpip config set global.index-url https://mirrors.tencent.com/pypi/simple \
&& rm -rf /www/server/data/* \
&& echo "docker_bt_d12" > /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 \
@ -38,11 +40,16 @@ RUN echo btpanel | bt 6 \
&& echo btpaneldocker | bt 5 \
&& echo "/btpanel" > /www/server/panel/data/admin_path.pl \
&& echo "root:btpaneldocker" | chpasswd
# 打包宝塔面板并清除www
RUN bt 2 \
&& tar -zcf /www.tar.gz /www \
&& rm -rf /www
ENTRYPOINT ["/bin/sh","-c","/bt.sh"]
# 暴漏所有端口
EXPOSE 0-65535
# 暴漏特定端口
EXPOSE 22 80 443 888 3306 8888
# 健康检查
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

58
README.md Normal file
View File

@ -0,0 +1,58 @@
> 此 Docker 镜像由宝塔面板官方发布,镜像版本为宝塔面板 9.3.0 正式版和 9.0.0_lts 稳定版,镜像会随着宝塔面板更新,目前支持`x86_64``arm64`架构。
![badge](https://cnb.cool/btpanel/btpanel/-/badge/git/latest/ci/git-clone-yyds)
![badge](https://cnb.cool/btpanel/btpanel/-/badge/git/latest/ci/pipeline-as-code)
![badge](https://cnb.cool/btpanel/btpanel/-/badge/git/latest/ci/status/push)
## 使用方法
> 以下命令中的镜像默认使用 CNB 仓库镜像,如需直接从 DockerHub 拉取,请替换镜像地址,如将`docker.cnb.cool/btpanel/btpanel:latest`替换为`btpanel:baota:latest`
### Docker Run
- 复制下方的命令无需映射端口使用本地网络直接部署宝塔面板docker镜像
```bash
docker run -d --restart unless-stopped --name baota --net=host -v ~/www:/www docker.cnb.cool/btpanel/btpanel:latest
```
- 复制下方的命令映射指定端口部署宝塔面板docker镜像
```bash
docker run -d --restart unless-stopped --name baota -p 8888:8888 -p 22:22 -p 443:443 -p 80:80 -p 888:888 -v ~/www:/www docker.cnb.cool/btpanel/btpanel:latest
```
### Docker Compose
```yml
services:
btpanel:
image: docker.cnb.cool/btpanel/btpanel:latest # 宝塔面板官方镜像国内源也可直接使用dockerhub镜像 btpanel/baota:latest
deploy:
resources:
limits:
cpus: "2.0" # 最大CPU核心限制根据实际情况调整
memory: "1024M" # 最大内存限制,根据实际情况调整
restart_policy:
condition: always
ports:
- "38888:8888" # 宝塔面板对外访问端口默认38888
- "8080:80" # Web服务端口默认8080
- "8443:443" # HTTPS服务端口默认8443
- "33306:3306" # MySQL服务端口默认33306不需要暴露到容器外可删除
- "22022:22" # SSH服务端口默认22022不需要暴露到容器外可删除
- "32888:888" # PHPMyAdmin服务端口默认32888不需要暴露到容器外可删除
volumes:
- "/www:/www" # 持久化存储宝塔面板数据,默认/www可根据实际情况调整目录
labels:
createdBy: "bt_apps"
```
## 如果面板需要使用Docker
参考格式 本地docker环境挂载进面板docker使用
```yml
- "/usr/bin/docker:/usr/bin/docker"
- "/run/docker.sock:/run/docker.sock"
```
## 镜像说明
除标注了`9.0_lts`稳定版的标签外,其他镜像均为`9.3.0/9.2.0`正式版
- `latest`:基于`Debian12`镜像打包,安装了宝塔面板和后续安装环境所用的依赖。
- `nas`:基于`Debian12`镜像打包,安装了宝塔面板和`Nginx 1.27`(amd架构)或`Nginx openresty`(arm64架构)
- `9.0_lts_fresh`:基于`Debian12`镜像打包,安装了宝塔面板稳定版。
- `9.0_lts_lib`:基于`Debian12`镜像打包,安装了宝塔面板稳定版和和后续安装环境所用的依赖。
- `slim`:基于`debian:bookworm-slim`镜像打包,仅安装了宝塔面板,体积较小。

20
bt.sh
View File

@ -8,6 +8,24 @@ Setup_Path=$Root_Path/server/mysql
Data_Path=$Root_Path/server/data
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(){
# 扫描并启动所有服务
init_scripts=$(ls ${init_path})
@ -68,6 +86,8 @@ start_mysql(){
fi
}
restore_panel_data > /dev/null
backup_database > /dev/null
is_empty_Data > /dev/null
init_mysql > /dev/null
start_mysql > /dev/null