From 173bb6f1a25dc832cdba09f27ad3f74efea93fc3 Mon Sep 17 00:00:00 2001
From: xiao <K5IFzgsHyFkgN2rl7B04RB+xiao@noreply.cnb.cool>
Date: Mon, 25 Nov 2024 12:46:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cnb.yml         | 26 +++++++++++++-------------
 Dockerfile       |  6 +++---
 arm64/Dockerfile |  6 +++---
 arm64/bt.sh      |  2 +-
 bt.sh            |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.cnb.yml b/.cnb.yml
index 1da02c9..2856f3c 100644
--- a/.cnb.yml
+++ b/.cnb.yml
@@ -5,17 +5,17 @@ $:
       docker:
         build: 
           dockerfile: .ide/Dockerfile
+bullseye:
   push:
     - runner:
         tags: cnb:arch:amd64
       services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:lnmp_debian12-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
@@ -30,27 +30,27 @@ $:
         cpus: 16
       services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:lnmp_debian12-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} -f ./arm64/Dockerfile ./arm64
+          script: docker build -t ${IMAGE_TAG} .
         - name: docker push
           script: docker push ${IMAGE_TAG}
         - name: resolve
           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:lnmp_debian12
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}
       stages:
         - name: await the amd64
           type: cnb:await
@@ -63,8 +63,8 @@ $:
         - name: manifest
           image: cnbcool/manifest
           settings:
-            username: $DOCKER_USERNAME
-            password: $DOCKER_PASSWD
+            username: $CNB_TOKEN_USER_NAME
+            password: $CNB_TOKEN
             target: ${IMAGE_TAG}
             template: ${IMAGE_TAG}-OS-ARCH
             platforms:
diff --git a/Dockerfile b/Dockerfile
index f6405d6..917200e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM debian:bookworm
+FROM debian:bullseye
 
 # 切换 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 install -y \
     locales \
@@ -39,7 +39,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
     && rm -rf /www/server/mysql/src \
     && rm -rf /www/server/data/* \
     && rm -rf /www/server/nginx/src \
-    && echo "docker_btlnmp_d12" > /www/server/panel/data/o.pl \
+    && echo "docker_btlnmp_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/* \
diff --git a/arm64/Dockerfile b/arm64/Dockerfile
index d22f595..48c7fe6 100644
--- a/arm64/Dockerfile
+++ b/arm64/Dockerfile
@@ -1,7 +1,7 @@
-FROM debian:bookworm
+FROM debian:bullseye
 
 # 切换 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 install -y \
     locales \
@@ -39,7 +39,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
     && rm -rf /www/server/mysql/src \
     && rm -rf /www/server/data/* \
     && rm -rf /www/server/nginx/src \
-    && echo "docker_btlnmp_d12" > /www/server/panel/data/o.pl \
+    && echo "docker_btlnmp_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/* \
diff --git a/arm64/bt.sh b/arm64/bt.sh
index 101e6c9..d4a3b92 100644
--- a/arm64/bt.sh
+++ b/arm64/bt.sh
@@ -38,7 +38,7 @@ soft_start(){
 }
 
 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
     fi
     if [ -d "${Data_Path}" ]; then
diff --git a/bt.sh b/bt.sh
index 101e6c9..d4a3b92 100644
--- a/bt.sh
+++ b/bt.sh
@@ -38,7 +38,7 @@ soft_start(){
 }
 
 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
     fi
     if [ -d "${Data_Path}" ]; then