更新流水线

.cnb.yml

@@ -6,84 +6,84 @@ $:
         build: 
           dockerfile: .ide/Dockerfile
   push:
-    # - runner:
-    #     tags: cnb:arch:amd64
-    #   services:
-    #     - docker
-    #   imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
-    #   env:
-    #     IMAGE_TAG: btpanel/baota:nas-dev-linux-amd64
-    #   stages:
-    #     - name: docker login
-    #       script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
-    #     - name: docker build
-    #       script: docker build -t ${IMAGE_TAG} .
-    #     - name: docker push
-    #       script: docker push ${IMAGE_TAG}
-    #     - name: resolve
-    #       type: cnb:resolve
-    #       options:
-    #         key: build-amd64 
+    - runner:
+        tags: cnb:arch:amd64
+      services:
+        - docker
+      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+      env:
+        IMAGE_TAG: btpanel/baota:nas-linux-amd64
+      stages:
+        - name: docker login
+          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
+        - name: docker build
+          script: docker build -t ${IMAGE_TAG} .
+        - name: docker push
+          script: docker push ${IMAGE_TAG}
+        - name: resolve
+          type: cnb:resolve
+          options:
+            key: build-amd64 
           
-    # - runner:
-    #     tags: cnb:arch:arm64:v8
-    #   services:
-    #     - docker
-    #   imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
-    #   env:
-    #     IMAGE_TAG: btpanel/baota:nas-dev-linux-arm64
-    #   stages:
-    #     - name: docker login
-    #       script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
-    #     - name: docker build
-    #       script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64
-    #     - name: docker push
-    #       script: docker push ${IMAGE_TAG}
-    #     - name: resolve
-    #       type: cnb:resolve
-    #       options:
-    #         key: build-arm64
+    - runner:
+        tags: cnb:arch:arm64:v8
+      services:
+        - docker
+      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+      env:
+        IMAGE_TAG: btpanel/baota:nas-linux-arm64
+      stages:
+        - name: docker login
+          script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
+        - name: docker build
+          script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64
+        - name: docker push
+          script: docker push ${IMAGE_TAG}
+        - name: resolve
+          type: cnb:resolve
+          options:
+            key: build-arm64
 
-    # - services:
-    #     - docker
-    #   imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
-    #   env:
-    #     IMAGE_TAG: btpanel/baota:nas-dev
-    #   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: $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
+    - services:
+        - docker
+      imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
+      env:
+        IMAGE_TAG: btpanel/baota:nas
+      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: $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}:nas-dev-linux-amd64
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-amd64
       stages:
         - name: docker login
           script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
@@ -101,7 +101,7 @@ $:
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev-linux-arm64
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-arm64
       stages:
         - name: docker login
           script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
@@ -120,7 +120,7 @@ $:
       services:
         - docker
       env:
-        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev
+        IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas
       stages:
         - name: await the amd64
           type: cnb:await
@@ -145,6 +145,6 @@ $:
           options:
             name: ${CNB_REPO_NAME}
             tags:
-              - nas-dev-linux-amd64
-              - nas-dev-linux-arm64
+              - nas-linux-amd64
+              - nas-linux-arm64
             type: docker