refactor: 优化 Dockerfile 中的端口暴露和健康检查设置

Update Dockerfile to use yum for cleaning and fixing CentOS mirror source
chore: Add random hostname with btc7-prefix and update CentOS mirror source
2024-12-21 09:25:04 +08:00 · 2024-12-04 12:37:05 +08:00 · 2024-12-04 12:15:41 +08:00 · 2024-12-04 12:12:41 +08:00 · 2024-12-04 12:02:03 +08:00 · 2024-12-04 11:57:29 +08:00
9 changed files with 44 additions and 316 deletions
--- a/.cnb.yml
+++ b/.cnb.yml
@ -5,43 +5,17 @@ $:
      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)
-
+cent7.9:
  push:
    - runner:
        tags: cnb:arch:amd64
      services:
        - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
      env:
-        IMAGE_TAG: btpanel/baota:latest-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
@ -53,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-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}
@ -69,12 +44,13 @@ $:
          type: cnb:resolve
          options:
            key: build-arm64
-
-    - services:
+    - runner:
+        tags: cnb:arch:amd64
+        cpus: 2
+      services:
        - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
      env:
-        IMAGE_TAG: btpanel/baota:latest
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}
      stages:
        - name: await the amd64
          type: cnb:await
@ -84,78 +60,6 @@ $:
          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}:latest-linux-amd64
-      stages:
-        - name: docker login
-          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
-          script: docker push ${IMAGE_TAG}
-        - name: resolve
-          type: cnb:resolve
-          options:
-            key: cnb-build-amd64 
-          
-    - runner:
-        tags: cnb:arch:arm64:v8
-      services:
-        - docker
-      env:
-        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}
-        - name: docker build
-          script: docker build -t ${IMAGE_TAG} .
-        - name: docker push
-          script: docker push ${IMAGE_TAG}
-        - name: resolve
-          type: cnb:resolve
-          options:
-            key: cnb-build-arm64
-
-    - runner:
-        tags: cnb:arch:amd64
-        cpus: 2
-      services:
-        - docker
-      env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest
-      stages:
-        - name: await the amd64
-          type: cnb:await
-          options:
-            key: cnb-build-amd64
-        - name: await the arm64
-          type: cnb:await
-          options:
-            key: cnb-build-arm64
        - name: manifest
          image: cnbcool/manifest
          settings:
@ -165,12 +69,4 @@ $:
            template: ${IMAGE_TAG}-OS-ARCH
            platforms:
              - linux/amd64
-              - linux/arm64
-        - name: remove tag
-          type: artifact:remove-tag
-          options:
-            name: ${CNB_REPO_NAME}
-            tags:
-              - latest-linux-amd64
-              - latest-linux-arm64
-            type: docker
+              - linux/arm64
--- a/.cnb/ISSUE_TEMPLATE/0-feature-request.yml
+++ b/.cnb/ISSUE_TEMPLATE/0-feature-request.yml
@ -1,22 +0,0 @@
-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: 您考虑过哪些替代方案？如有
--- a/.cnb/ISSUE_TEMPLATE/2-bug-report.yml
+++ b/.cnb/ISSUE_TEMPLATE/2-bug-report.yml
@ -1,20 +0,0 @@
-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
--- a/.cnb/ISSUE_TEMPLATE/3-experience-report.yml
+++ b/.cnb/ISSUE_TEMPLATE/3-experience-report.yml
@ -1,13 +0,0 @@
-name: experience improve
-description: 该模版用于反馈体验问题
-labels: 
-  - 体验优化
-body:
-  - type: textarea
-    attributes:
-      label: 描述一下体验不好的点
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 优化建议？如有
--- a/.cnb/ISSUE_TEMPLATE/config.yml
+++ b/.cnb/ISSUE_TEMPLATE/config.yml
@ -1 +0,0 @@
-blank_issues_enabled: true
--- a/.gitea/workflows/build-docker-images.yml
+++ b/.gitea/workflows/build-docker-images.yml
@ -1,38 +0,0 @@
-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 }}
-    
--- a/54
+++ b/54
@ -1,20 +1,30 @@
-FROM debian:bookworm
+FROM centos:centos7.9.2009

-# 切换 Debian 镜像源为腾讯云源，更新包列表并安装依赖
-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 \
-    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/* 
+# 设置构建参数
+ARG RANDOM_NAME
+
+# 设置一个btc7-前缀的随机主机名
+RUN echo "btc7-${RANDOM_NAME}" > /etc/hostname
+
+# 切换 CentOS 镜像源为腾讯云源，更新包列表并安装依赖
+RUN sed -i.bak \
+    -e 's|^mirrorlist=|#mirrorlist=|g' \
+    -e 's|^#baseurl=http://mirror.centos.org|baseurl=https://mirrors.tencent.com/centos-vault|g' \
+    -i.bak \
+    /etc/yum.repos.d/*.repo \
+    && yum clean all \
+    && yum makecache \
+    && yum update -y \
+    && yum install -y \
+    glibc-locale-source \
+    wget iproute openssh-server gd-devel cmake make gcc gcc-c++ autoconf \
+    libsodium-devel oniguruma-devel libssh2-devel c-ares-devel libaio-devel sudo curl dos2unix \
+    bzip2 zip unzip tar ncurses-devel libtool libevent-devel openssl-devel cyrus-sasl-devel \
+    libtool-ltdl-devel zlib-devel glib2 glib2-devel krb5-devel postgresql-devel gettext libcap-devel \
+    uw-imap-devel psmisc patch git e2fsprogs libxslt-devel xz libwebp-devel libvpx-devel \
+    freetype-devel libjpeg-turbo libjpeg-turbo-devel iptables systemd-devel openldap-devel \
+    && yum clean all \
+    && rm -rf /var/cache/yum

 # 复制脚本
 COPY ["bt.sh", "init_mysql.sh", "/"]
@ -25,12 +35,11 @@ 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 "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 \
-    && apt clean \
-    && rm -rf /var/lib/apt/lists/* \
+    && yum clean all \
+    && rm -rf /var/cache/yum \
    && chmod +x /bt.sh \
    && chmod +x /init_mysql.sh
    
@ -40,11 +49,6 @@ 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"]

--- a/README.md
+++ b/README.md
@ -1,58 +0,0 @@
-> 此 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`镜像打包，仅安装了宝塔面板，体积较小。
-
--- a/bt.sh
+++ b/bt.sh
@ -8,24 +8,6 @@ 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})
@ -56,7 +38,7 @@ soft_start(){
 }

 init_mysql(){
-    if [ "${O_pl}" != "docker_btlamp_d12" ] && [ "${O_pl}" != "docker_btlnmp_d12" ];then
+    if [ "${O_pl}" != "docker_btlamp_c79" ] && [ "${O_pl}" != "docker_btlnmp_c79" ];then
        return
    fi
    if [ -d "${Data_Path}" ]; then
@ -69,7 +51,7 @@ init_mysql(){
        fi
    fi
    if [ -f /init_mysql.sh ] && [ -d "${Setup_Path}" ];then
-        bash /init_mysql.sh
+        sh /init_mysql.sh
        rm -f /init_mysql.sh
    fi
 }
@ -86,8 +68,6 @@ 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
Author	SHA1	Message	Date
xiao	5fc39017c4	refactor: 优化 Dockerfile 中的端口暴露和健康检查设置	2024-12-21 09:25:04 +08:00
xiao	537c7d2bd6	Update Dockerfile to use yum for cleaning and fixing CentOS mirror source	2024-12-04 12:37:05 +08:00
xiao	781e5ce202	chore: Add random hostname with btc7-prefix and update CentOS mirror source	2024-12-04 12:15:41 +08:00
xiao	02008b5c02	Update Dockerfile to switch CentOS mirror source to Tencent Cloud and simplify sed commands	2024-12-04 12:12:41 +08:00
xiao	dd36a58ac8	Update Dockerfile to correct CentOS extras mirror source URL	2024-12-04 12:02:03 +08:00
xiao	6c8feec95f	Update Dockerfile to switch CentOS mirror source to Tencent Cloud and update dependencies	2024-12-04 11:57:29 +08:00
xiao	c16a8295b2	Update Dockerfile to remove EPEL repo and clean up mirror sources	2024-12-04 11:53:21 +08:00
xiao	50b71872e1	Update Dockerfile to switch CentOS mirror source to CentOS Vault and update dependencies	2024-12-04 11:46:08 +08:00
xiao	d45f9a3688	feat: 更新换源	2024-12-04 11:31:51 +08:00
xiao	f8b13a1d0c	Update Docker build and push process, system identification, and Dockerfile for CentOS 7.9	2024-12-04 11:30:24 +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