From a064b0a9f1d6b964ffc713382e17a8b10a7baf92 Mon Sep 17 00:00:00 2001
From: xiao <K5IFzgsHyFkgN2rl7B04RB+xiao@noreply.cnb.cool>
Date: Sat, 21 Dec 2024 19:41:41 +0800
Subject: [PATCH] Update .cnb.yml and Dockerfiles for timeout configuration,
 script adjustments, and ARM64 architecture support

---
 .cnb.yml         | 3 ++-
 Dockerfile       | 5 +++--
 arm64/Dockerfile | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cnb.yml b/.cnb.yml
index cbdd390..f483715 100644
--- a/.cnb.yml
+++ b/.cnb.yml
@@ -17,6 +17,7 @@ $:
         - name: docker login
           script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
         - name: docker build
+          timeout: 3600s
           script: docker build -t ${IMAGE_TAG} .
         - name: docker push
           script: docker push ${IMAGE_TAG}
@@ -46,7 +47,7 @@ $:
           options:
             key: build-arm64
     - runner:
-        tags: cnb:arch:amd64:v8
+        tags: cnb:arch:amd64
         cpus: 2
       services:
         - docker
diff --git a/Dockerfile b/Dockerfile
index ea1bd86..c70ccef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,10 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
 
 # 复制脚本
 COPY ["bt.sh", "init_mysql.sh", "/"]
-COPY ["phpmyadmin.sh","mysql.sh", "/lnmp/"]
+COPY ["phpmyadmin.sh", "/lnmp/"]
 
 # 转换启动脚本
-RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh
+RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
 
 # 下载并安装宝塔面板及 lnmp 环境
 RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
@@ -29,6 +29,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
     && sh /lnmp/nginx.sh install 1.27 \ 
     && curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \
     && sh /lnmp/php.sh install 8.3 \
+    && curl -o /lnmp/mysql.sh https://download.bt.cn/install/3/mysql.sh \
     && sh /lnmp/mysql.sh install 8.0 \
     && sh /lnmp/phpmyadmin.sh install 5.2 \
     && rm -rf /lnmp \
diff --git a/arm64/Dockerfile b/arm64/Dockerfile
index 3cf61ea..7cac4c8 100644
--- a/arm64/Dockerfile
+++ b/arm64/Dockerfile
@@ -17,7 +17,7 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
 
 # 复制脚本
 COPY ["bt.sh", "init_mysql.sh", "/"]
-COPY ["phpmyadmin.sh","mysql.sh", "/lnmp/"]
+COPY ["phpmyadmin.sh", "/lnmp/"]
 
 # 转换启动脚本
 RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh
@@ -29,6 +29,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
     && sh /lnmp/nginx.sh install openresty \ 
     && curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \
     && sh /lnmp/php.sh install 8.3 \
+    && curl -o /lnmp/mysql.sh https://download.bt.cn/install/3/mysql.sh \
     && sh /lnmp/mysql.sh install 8.0 \
     && sh /lnmp/phpmyadmin.sh install 5.2 \
     && rm -rf /lnmp \