Merge pull request 'Changes' (#65) from mxy_dev into main

Reviewed-on: #65

.drone.yml

@@ -41,6 +41,7 @@ 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
@@ -192,25 +193,38 @@ steps:
       - frontend-build
 #      - debug_context
 
-  - name: docker_build
+  - name: backend_docker_build
-    image: docker:latest
+    image: registry.cn-beijing.aliyuncs.com/yinzy/drone-plugins:docker-latest
     pull: false
-    volumes:
+    settings:
-      - name: docker_sock
+      volumes:
-        path: /var/run/docker.sock
+        - name: certs
-    commands:
+          path: /etc/docker/certs.d/docker-registry.local:36000/
-      - docker info || (echo "❌ Docker daemon not available" && exit 1)
+      debug: true
-      - |
+      daemon_off: false   # 👈 必须启用 DinD 才能让 extra_files 生效
-        if [ ! -f target/drone-test-1.0.jar ]; then
+      # 1. 仓库认证信息
-          echo "❌ JAR file not found! Make sure java-build step completed successfully."
+      registry:
-          ls -la target/ || echo "target directory does not exist"
+        from_secret: local_registry_base_url
-          exit 1
+      username:
-        fi
+        from_secret: local_registry_user
-        echo "📦 Building Docker image: ${DRONE_REPO_NAME}:latest"
+      password:
-        ls -lh target/drone-test-1.0.jar
+        from_secret: local_registry_pass
-        docker build -t ${DRONE_REPO_NAME}:latest -f docker/Dockerfile .
+
-        docker tag ${DRONE_REPO_NAME}:latest ${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA:0:8}
+      # 2. 镜像名称 (不包含 Tag)
-        docker images ${DRONE_REPO_NAME}
+      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
 
@@ -236,8 +250,9 @@ steps:
         Build: ${DRONE_BUILD_NUMBER}
       file_exists: overwrite
     depends_on:
-      - docker_build
+      - backend_docker_build
       - frontend_docker_build
+
   - name: push_acr
     image: docker:latest
     pull: false
@@ -261,7 +276,7 @@ steps:
       - docker tag ${DRONE_REPO_NAME}-frontend:latest $ACR_REGISTRY/$ACR_NAMESPACE/$ACR_REPO:front-${DRONE_TAG}
       - docker push $ACR_REGISTRY/$ACR_NAMESPACE/$ACR_REPO:front-${DRONE_TAG}
     depends_on:
-      - docker_build
+      - backend_docker_build
       - frontend_docker_build
     when:
       event:

test_example.py

@@ -9,4 +9,4 @@ def test_drone_env():
     assert 'DRONE' in os.environ  # 验证是否在 Drone 环境中运行
 
 def test_1():
-    print("本地开发分支提交")
+    print("本地开发分支提交!s")