From 6308b4a235735558692059147f220b2a0e9af08b Mon Sep 17 00:00:00 2001
From: 111 <a111@111deMacBook-Pro.local>
Date: Tue, 3 Feb 2026 17:01:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=20docker:dind=20?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=9E=84=E5=BB=BA=E5=B9=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=88=B0=20ACR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .drone.yml | 65 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b74e0c4..967df90 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,34 +12,55 @@ trigger:
 steps:
   # 构建并推送后端镜像
   - name: build-push-backend
-    image: plugins/docker
-    settings:
-      registry:
+    image: docker:dind
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_REGISTRY:
         from_secret: docker_registry
-      username:
+      DOCKER_USERNAME:
         from_secret: docker_username
-      password:
+      DOCKER_PASSWORD:
         from_secret: docker_password
-      repo: crpi-na6dit5kd0bonqed.cn-guangzhou.personal.cr.aliyuncs.com/ireborn/ai-interview-backend
-      dockerfile: deploy/Dockerfile.backend
-      tags:
-        - latest
-        - ${DRONE_BRANCH}
-        - ${DRONE_COMMIT_SHA:0:8}
+    commands:
+      - echo "登录 ACR..."
+      - echo "$DOCKER_PASSWORD" | docker login "$DOCKER_REGISTRY" -u "$DOCKER_USERNAME" --password-stdin
+      - echo "构建后端镜像..."
+      - docker build -t $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH} -f deploy/Dockerfile.backend .
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-backend:latest
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_COMMIT_SHA:0:8}
+      - echo "推送后端镜像..."
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH}
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-backend:latest
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_COMMIT_SHA:0:8}
 
   # 构建并推送前端镜像
   - name: build-push-frontend
-    image: plugins/docker
-    settings:
-      registry:
+    image: docker:dind
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_REGISTRY:
         from_secret: docker_registry
-      username:
+      DOCKER_USERNAME:
         from_secret: docker_username
-      password:
+      DOCKER_PASSWORD:
         from_secret: docker_password
-      repo: crpi-na6dit5kd0bonqed.cn-guangzhou.personal.cr.aliyuncs.com/ireborn/ai-interview-frontend
-      dockerfile: deploy/Dockerfile.frontend
-      tags:
-        - latest
-        - ${DRONE_BRANCH}
-        - ${DRONE_COMMIT_SHA:0:8}
+    commands:
+      - echo "登录 ACR..."
+      - echo "$DOCKER_PASSWORD" | docker login "$DOCKER_REGISTRY" -u "$DOCKER_USERNAME" --password-stdin
+      - echo "构建前端镜像..."
+      - docker build -t $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH} -f deploy/Dockerfile.frontend .
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-frontend:latest
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_COMMIT_SHA:0:8}
+      - echo "推送前端镜像..."
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH}
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-frontend:latest
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_COMMIT_SHA:0:8}
+
+volumes:
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock