From 9ff3d5d87a98374e46d086c25811113deb1357c0 Mon Sep 17 00:00:00 2001
From: xiao <K5IFzgsHyFkgN2rl7B04RB+xiao@noreply.cnb.cool>
Date: Sat, 16 Nov 2024 22:04:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20Docker=20=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E6=A0=87=E7=AD=BE=E5=92=8C=E7=99=BB=E5=BD=95=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cnb.yml | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/.cnb.yml b/.cnb.yml
index 91fd1c0..3bc29f4 100644
--- a/.cnb.yml
+++ b/.cnb.yml
@@ -11,10 +11,10 @@ $:
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-amd64
+        IMAGE_TAG: btpanel/baota:latest_debian12:latest-linux-amd64
       stages:
         - name: docker login
-          script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
+          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
         - name: docker build
           script: docker build -t ${IMAGE_TAG} .
         - name: docker push
@@ -29,10 +29,10 @@ $:
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-arm64
+        IMAGE_TAG: btpanel/baota:latest_debian12:latest-linux-arm64
       stages:
         - name: docker login
-          script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
+          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
         - name: docker build
           script: docker build -t ${IMAGE_TAG} .
         - name: docker push
@@ -42,30 +42,6 @@ $:
           options:
             key: build-arm64
 
-    - services:
-        - docker
-      env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}: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: $CNB_TOKEN_USER_NAME
-            password: $CNB_TOKEN
-            target: ${IMAGE_TAG}
-            template: ${IMAGE_TAG}-OS-ARCH
-            platforms:
-              - linux/amd64
-              - linux/arm64
-
     - services:
         - docker
       imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml