.drone.yml

@@ -41,7 +41,6 @@ steps:
       - cat ~/.m2/settings.xml
       - mvn -B clean test package
       - ls -lah target/*.jar || (echo "JAR file not found!" && exit 1)
-      - \cp target/*.jar ./ -f
 
   - name: frontend-build
     image: registry.cn-beijing.aliyuncs.com/yinzy/node:20.11-alpine3.19
@@ -193,38 +192,25 @@ steps:
       - frontend-build
 #      - debug_context
 
-  - name: backend_docker_build
+  - name: docker_build
-    image: registry.cn-beijing.aliyuncs.com/yinzy/drone-plugins:docker-latest
+    image: docker:latest
     pull: false
-    settings:
     volumes:
-        - name: certs
+      - name: docker_sock
-          path: /etc/docker/certs.d/docker-registry.local:36000/
+        path: /var/run/docker.sock
-      debug: true
+    commands:
-      daemon_off: false   # 👈 必须启用 DinD 才能让 extra_files 生效
+      - docker info || (echo "❌ Docker daemon not available" && exit 1)
-      # 1. 仓库认证信息
+      - |
-      registry:
+        if [ ! -f target/drone-test-1.0.jar ]; then
-        from_secret: local_registry_base_url
+          echo "❌ JAR file not found! Make sure java-build step completed successfully."
-      username:
+          ls -la target/ || echo "target directory does not exist"
-        from_secret: local_registry_user
+          exit 1
-      password:
+        fi
-        from_secret: local_registry_pass
+        echo "📦 Building Docker image: ${DRONE_REPO_NAME}:latest"
-
+        ls -lh target/drone-test-1.0.jar
-      # 2. 镜像名称 (不包含 Tag)
+        docker build -t ${DRONE_REPO_NAME}:latest -f docker/Dockerfile .
-      repo: docker-registry.local:36000/jk/apps/${DRONE_REPO_NAME}-backend
+        docker tag ${DRONE_REPO_NAME}:latest ${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA:0:8}
-
+        docker images ${DRONE_REPO_NAME}
-      # 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