取消国内镜像源

将备份数据库函数中的时间戳格式从 `%Y%m%d%H%M%S` 修改为 Unix 时间戳 `%s`，保证时间格式统一且更利于数值计算和处理。

.cnb.yml

@@ -5,85 +5,111 @@ $:
       docker:
         build: 
           dockerfile: .ide/Dockerfile
-  push:
+  issue.open:
-    # - runner:
+    - stages:
-    #     tags: cnb:arch:amd64
+        - name: issue-notice
-    #   services:
+          image: tencentcom/wecom-message
-    #     - docker
+          imports: https://cnb.cool/btpanel/secret/-/blob/main/wework-robots.yml
-    #   imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+          settings:
-    #   env:
+            robot: $CNB_WARRIOR_ROBOT
-    #     IMAGE_TAG: btpanel/baota:alpine-linux-amd64
+            msgType: markdown
-    #   stages:
+            content: |
-    #     - name: docker login
+              > **有人提issue啦**
-    #       script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
+              > **标  题:** $CNB_ISSUE_TITLE
-    #     - name: docker build
+              > **发起人:** $CNB_ISSUE_OWNER
-    #       script: docker build -t ${IMAGE_TAG} .
+              > **查看:** [$CNB_EVENT_URL]($CNB_EVENT_URL)
-    #     - name: docker push
+  issue.reopen:
-    #       script: docker push ${IMAGE_TAG}
+    - stages:
-    #     - name: resolve
+        - name: issue-notice
-    #       type: cnb:resolve
+          image: tencentcom/wecom-message
-    #       options:
+          imports: https://cnb.cool/btpanel/secret/-/blob/main/wework-robots.yml
-    #         key: build-amd64 
+          settings:
-          
+            robot: $CNB_WARRIOR_ROBOT
-    # - runner:
+            content: |
-    #     tags: cnb:arch:arm64:v8
+              > **$CNB_BUILD_USER重新打开了一个issue**
-    #   services:
+              > **标  题:** $CNB_ISSUE_TITLE
-    #     - docker
+              > **发起人:** $CNB_ISSUE_OWNER
-    #   imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+              > **查  看:** [$CNB_EVENT_URL]($CNB_EVENT_URL)
-    #   env:
-    #     IMAGE_TAG: btpanel/baota:alpine-linux-arm64
-    #   stages:
-    #     - name: docker login
-    #       script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
-    #     - name: docker build
-    #       script: docker build -t ${IMAGE_TAG} .
-    #     - name: docker push
-    #       script: docker push ${IMAGE_TAG}
-    #     - name: resolve
-    #       type: cnb:resolve
-    #       options:
-    #         key: build-arm64
 
-    # - services:
+  push:
-    #     - docker
+    - runner:
-    #   imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+        tags: cnb:arch:amd64
-    #   env:
+      services:
-    #     IMAGE_TAG: btpanel/baota:alpine
+        - docker
-    #   stages:
+      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
-    #     - name: await the amd64
+      env:
-    #       type: cnb:await
+        IMAGE_TAG: btpanel/baota:latest-linux-amd64
-    #       options:
+      stages:
-    #         key: build-amd64
+        - name: docker login
-    #     - name: await the arm64
+          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
-    #       type: cnb:await
+        - name: docker build
-    #       options:
+          script: docker build -t ${IMAGE_TAG} .
-    #         key: build-arm64
+        - name: docker push
-    #     - name: manifest
+          script: docker push ${IMAGE_TAG}
-    #       image: cnbcool/manifest
+        - name: resolve
-    #       settings:
+          type: cnb:resolve
-    #         username: $DOCKER_USERNAME
+          options:
-    #         password: $DOCKER_PASSWD
+            key: build-amd64 
-    #         target: ${IMAGE_TAG}
+          
-    #         template: ${IMAGE_TAG}-OS-ARCH
+    - runner:
-    #         platforms:
+        tags: cnb:arch:arm64:v8
-    #           - linux/amd64
+      services:
-    #           - linux/arm64
+        - docker
-    #     - name: clear
+      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
-    #       image: lumir/remove-dockerhub-tag
+      env:
-    #       args:
+        IMAGE_TAG: btpanel/baota:latest-linux-arm64
-    #         - --user
+      stages:
-    #         - $DOCKER_USERNAME
+        - name: docker login
-    #         - --password
+          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
-    #         - $DOCKER_PASSWD
+        - name: docker build
-    #         - ${IMAGE_TAG}-linux-amd64
+          script: docker build -t ${IMAGE_TAG} .
-    #         - ${IMAGE_TAG}-linux-arm64
+        - name: docker push
+          script: docker push ${IMAGE_TAG}
+        - name: resolve
+          type: cnb:resolve
+          options:
+            key: build-arm64
+
+    - services:
+        - docker
+      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+      env:
+        IMAGE_TAG: btpanel/baota:latest
+      stages:
+        - name: await the amd64
+          type: cnb:await
+          options:
+            key: build-amd64
+        - name: await the arm64
+          type: cnb:await
+          options:
+            key: build-arm64
+        - name: manifest
+          image: cnbcool/manifest
+          settings:
+            username: $DOCKER_USERNAME
+            password: $DOCKER_PASSWD
+            target: ${IMAGE_TAG}
+            template: ${IMAGE_TAG}-OS-ARCH
+            platforms:
+              - linux/amd64
+              - linux/arm64
+        - name: clear
+          image: lumir/remove-dockerhub-tag
+          args:
+            - --user
+            - $DOCKER_USERNAME
+            - --password
+            - $DOCKER_PASSWD
+            - ${IMAGE_TAG}-linux-amd64
+            - ${IMAGE_TAG}-linux-arm64
 
     - runner:
         tags: cnb:arch:amd64
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:alpine-linux-amd64
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-amd64
       stages:
         - name: docker login
           script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
@@ -101,7 +127,7 @@ $:
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:alpine-linux-arm64
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-arm64
       stages:
         - name: docker login
           script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
@@ -120,7 +146,7 @@ $:
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:alpine
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest
       stages:
         - name: await the amd64
           type: cnb:await
@@ -145,6 +171,6 @@ $:
           options:
             name: ${CNB_REPO_NAME}
             tags:
-              - alpine-linux-amd64
+              - latest-linux-amd64
-              - alpine-linux-arm64
+              - latest-linux-arm64
             type: docker

.cnb/ISSUE_TEMPLATE/0-feature-request.yml

@@ -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: 您考虑过哪些替代方案？如有

.cnb/ISSUE_TEMPLATE/2-bug-report.yml

@@ -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

.cnb/ISSUE_TEMPLATE/3-experience-report.yml

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

.cnb/ISSUE_TEMPLATE/config.yml

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

.gitea/workflows/build-docker-images.yml

@@ -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 }}
+    

Dockerfile

@@ -1,39 +1,54 @@
-FROM python:3.7.16-alpine
+FROM debian:bookworm
 
-# 切换 alpine 镜像源为腾讯云源，更新包列表并安装依赖
+# 切换 Debian 镜像源为腾讯云源，更新包列表并安装依赖
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tencent.com/g' /etc/apk/repositories \
+RUN #sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \
-    && apk update && apk upgrade \
+    #&& 
-    && apk add openrc openssh curl curl-dev libffi-dev openssl-dev shadow bash zlib-dev g++ make sqlite-dev libpcap-dev jpeg-dev dos2unix libev-dev build-base linux-headers gd-dev \
+    apt update && apt upgrade -y \
-    && apk cache clean \
+    && apt install -y \
-    && rm -rf /var/cache/apk/*
+    locales \
+    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 \
+    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 \
+    libltdl-dev zlib1g-dev libglib2.0-0 libglib2.0-dev libkrb5-dev libpq-dev libpq5 gettext libcap-dev \
+    libc-client2007e-dev psmisc patch git e2fsprogs libxslt1-dev xz-utils libgd3 libwebp-dev libvpx-dev \
+    libfreetype6-dev libjpeg62-turbo libjpeg62-turbo-dev iptables libudev-dev libldap2-dev \
+    && apt clean \
+    && rm -rf /var/lib/apt/lists/* 
 
 # 复制脚本
-COPY ["bt.sh", "init_mysql.sh", "install_panel.sh", "/"]
+COPY ["bt.sh", "init_mysql.sh", "/"]
 
 # 转换启动脚本
-RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /install_panel.sh
+RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
 
 # 下载并安装宝塔面板及 lnmp 环境
-RUN echo y | bash /install_panel.sh -P 8888 --ssl-disable \
+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_alpine" > /www/server/panel/data/o.pl \
+    && 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 \
+    && apt clean \
+    && rm -rf /var/lib/apt/lists/* \
     && chmod +x /bt.sh \
-    && chmod +x /init_mysql.sh \
+    && chmod +x /init_mysql.sh
-    && apk cache clean \
+    
-    && rm -rf /var/cache/apk/*
 
 # 配置宝塔面板安全入口和用户名及密码，以及 SSH 密码
 RUN echo btpanel | bt 6 \
     && echo btpaneldocker | bt 5 \
     && echo "/btpanel" > /www/server/panel/data/admin_path.pl \
-    && echo "root:btpaneldocker" | chpasswd \
+    && echo "root:btpaneldocker" | chpasswd
-    && echo "PermitRootLogin yes" | tee -a /etc/ssh/sshd_config
+    
-
+# 打包宝塔面板，并清除www
+RUN bt 2 \
+    && tar -zcf /www.tar.gz /www \
+    && rm -rf /www
 
 ENTRYPOINT ["/bin/sh","-c","/bt.sh"]
 
-# 暴漏指定端口
+# 暴漏特定端口
 EXPOSE 22 80 443 888 3306 8888
 
 # 健康检查

README.md

@@ -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`镜像打包，仅安装了宝塔面板，体积较小。
+

bt.sh

@@ -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})
@@ -32,8 +50,7 @@ soft_start(){
 
     pkill crond
     /sbin/crond
-    
+
-    ssh-keygen -A
     chmod 600 /etc/ssh/ssh_host_*
     /usr/sbin/sshd -D &
 }
@@ -69,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