From bdc3bb03c108d867d042d286dd4eeb58a2d436f3 Mon Sep 17 00:00:00 2001
From: seahi <me@seahi.me>
Date: Fri, 18 Apr 2025 12:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=99=BB=E5=BD=95=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index dde98a6..60b1371 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,30 +6,39 @@ node:
   name: pve
 
 steps:
-  # 使用 plugins/docker 镜像作为登录步骤
-  - name: Login and Build
-    image: plugins/docker:20.10
+  - name: Pre-login to Docker Hub
+    image: docker:cli
     pull: if-not-exists
-    privileged: true
+    volumes:
+      - name: docker-config
+        path: /root/.docker
     environment:
       DOCKER_USERNAME:
         from_secret: dockerhub_username
       DOCKER_PASSWORD:
         from_secret: dockerhub_password
-      HARBOR_USERNAME:
-        from_secret: harbor_username
-      HARBOR_PASSWORD:
-        from_secret: harbor_password
     commands:
-      # 登录 Docker Hub
       - echo "Logging into Docker Hub..."
       - docker login docker.io -u "$${DOCKER_USERNAME}" -p "$${DOCKER_PASSWORD}"
-      # 手动构建和推送
-      - echo "Building image..."
-      - docker build -f Dockerfile -t harbor.seahi.me/stu/task-supervisor:latest .
-      # 登录 Harbor
-      - echo "Logging into Harbor..."
-      - docker login harbor.seahi.me -u "$${HARBOR_USERNAME}" -p "$${HARBOR_PASSWORD}"
-      # 推送到 Harbor
-      - echo "Pushing image..."
-      - docker push harbor.seahi.me/stu/task-supervisor:latest
+      - cat /root/.docker/config.json # 显示配置文件内容（可选，用于调试）
+
+  - name: Build and Push
+    image: plugins/docker:20.10
+    pull: if-not-exists
+    volumes:
+      - name: docker-config
+        path: /root/.docker
+    settings:
+      debug: true
+      dockerfile: Dockerfile
+      auto_tag: true
+      registry: harbor.seahi.me
+      repo: harbor.seahi.me/stu/task-supervisor
+      username:
+        from_secret: harbor_username
+      password:
+        from_secret: harbor_password
+
+volumes:
+  - name: docker-config
+    temp: {}