From 9c36b27ca93e00c5225f1f5d6bd414b754d871f2 Mon Sep 17 00:00:00 2001
From: xiao <K5IFzgsHyFkgN2rl7B04RB+xiao@noreply.cnb.cool>
Date: Mon, 25 Nov 2024 12:07:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20docker=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=92=8C=E6=8E=A8=E9=80=81=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化了 docker 构建和推送流程，使用环境变量替代硬编码的镜像标签和凭证，增加了构建超时设置，并为 arm64
---
 .cnb.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.cnb.yml b/.cnb.yml
index 388b855..23305cc 100644
--- a/.cnb.yml
+++ b/.cnb.yml
@@ -5,17 +5,17 @@ $:
       docker:
         build: 
           dockerfile: .ide/Dockerfile
+lamp:
   push:
     - runner:
         tags: cnb:arch:amd64
       services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:latest_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
@@ -27,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_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} .
         - name: docker push
           script: docker push ${IMAGE_TAG}
@@ -46,9 +47,8 @@ $:
 
     - services:
         - docker
-      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
       env:
-        IMAGE_TAG: btpanel/baota:latest_debian12
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}
       stages:
         - name: await the amd64
           type: cnb:await
@@ -61,8 +61,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: