From a19e8d933b088dd1287862caea05845bd61338fd Mon Sep 17 00:00:00 2001
From: kale <seg_yinzy@seginfo.com>
Date: Wed, 10 Dec 2025 12:02:53 -0500
Subject: [PATCH] =?UTF-8?q?[fix]:[20251208][drone=20=E5=85=A8=E9=9D=A2?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=A7=81=E6=9C=89=E4=BB=93=E5=BA=93]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 15718dc..955df36 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -192,25 +192,38 @@ steps:
       - frontend-build
 #      - debug_context
 
-  - name: docker_build
-    image: docker:latest
+  - name: backend_docker_build
+    image: registry.cn-beijing.aliyuncs.com/yinzy/drone-plugins:docker-latest
     pull: false
-    volumes:
-      - name: docker_sock
-        path: /var/run/docker.sock
-    commands:
-      - docker info || (echo "❌ Docker daemon not available" && exit 1)
-      - |
-        if [ ! -f target/drone-test-1.0.jar ]; then
-          echo "❌ JAR file not found! Make sure java-build step completed successfully."
-          ls -la target/ || echo "target directory does not exist"
-          exit 1
-        fi
-        echo "📦 Building Docker image: ${DRONE_REPO_NAME}:latest"
-        ls -lh target/drone-test-1.0.jar
-        docker build -t ${DRONE_REPO_NAME}:latest -f docker/Dockerfile .
-        docker tag ${DRONE_REPO_NAME}:latest ${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA:0:8}
-        docker images ${DRONE_REPO_NAME}
+    settings:
+      volumes:
+        - name: certs
+          path: /etc/docker/certs.d/docker-registry.local:36000/
+      debug: true
+      daemon_off: false   # 👈 必须启用 DinD 才能让 extra_files 生效
+      # 1. 仓库认证信息
+      registry:
+        from_secret: local_registry_base_url
+      username:
+        from_secret: local_registry_user
+      password:
+        from_secret: local_registry_pass
+
+      # 2. 镜像名称 (不包含 Tag)
+      repo: docker-registry.local:36000/jk/apps/${DRONE_REPO_NAME}-backend
+
+      # 3. 指定 Dockerfile 位置
+      dockerfile: docker/Dockerfile
+
+      # 4. 构建上下文 (Context)，默认为 . (根目录)
+      context: .
+
+      # 5. 生成的 Tags
+      tags:
+        - backend-${DRONE_TAG}       # e.g. back-v1.0.0
+        - backend-latest             # 方便随时拉取最新版
+      extra_files:
+        - drone-test-1.0.jar
     depends_on:
       - java-build