diff --git a/.drone.yml b/.drone.yml index 2980d88..86213dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -68,42 +68,34 @@ steps: - pom.xml event: [ push, pull_request, tag ] - # - name: docker_build - # image: docker:latest - # pull: false - # volumes: - # - name: docker_sock - # path: /var/run/docker.sock - # commands: - # # 验证 JAR 文件存在 - # - | - # 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 with tag: drone-test:${DRONE_REPO_NAME}" - # - echo "📁 JAR file info:" - # - ls -lh target/drone-test-1.0.jar - # # 构建 Docker 镜像 - # - docker build -t drone-test:${DRONE_REPO_NAME} -f Dockerfile . - # # 如果存在 DRONE_TAG,同时打 latest 标签 - # - | - # if [ -n "${DRONE_TAG}" ]; then - # docker tag drone-test:${DRONE_REPO_NAME} drone-test:latest - # echo "✅ Tagged as drone-test:latest" - # fi - # - echo "✅ Built Docker image: drone-test:${DRONE_REPO_NAME}" - # # 显示镜像信息 - # - docker images drone-test - # depends_on: - # - java-build - # when: - # path: - # include: - # - pom.xml - # event: [ push, pull_request, tag ] + - name: docker_build + image: docker:latest + pull: false + volumes: + - name: docker_sock + path: /var/run/docker.sock + commands: + # 验证 JAR 文件存在 + - | + 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" + echo "📁 JAR file info:" + ls -lh target/drone-test-1.0.jar + docker build -t ${DRONE_REPO_NAME}:latest -f Dockerfile . + docker tag ${DRONE_REPO_NAME}:latest ${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA:0:8} + echo "✅ Built Docker image: ${DRONE_REPO_NAME}:latest" + docker images ${DRONE_REPO_NAME} + depends_on: + - java-build + when: + path: + include: + - pom.xml + event: [ push, pull_request, tag ] # 自动检测是否存在 Python (requirements.txt) - name: python-test