diff --git a/.drone.yml b/.drone.yml index 7385d90..894408a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,30 +1,44 @@ kind: pipeline type: docker -name: Build docker iamge +name: Build docker image # 修正拼写错误 "iamge" -> "image" node: name: pve steps: + # 添加显式登录步骤,确保 Harbor 登录成功 + - name: Login to registries + image: docker:cli + environment: + DOCKER_USERNAME: + from_secret: dockerhub_username + DOCKER_PASSWORD: + from_secret: dockerhub_password + HARBOR_USERNAME: + from_secret: harbor_username + HARBOR_PASSWORD: + from_secret: harbor_password + commands: + - echo "Logging into Docker Hub..." + - docker login docker.io -u "$${DOCKER_USERNAME}" -p "$${DOCKER_PASSWORD}" + - echo "Logging into Harbor..." + - docker login harbor.seahi.me -u "$${HARBOR_USERNAME}" -p "$${HARBOR_PASSWORD}" + failure: ignore # 即使登录失败,也继续执行后续步骤以便调试 + + # 主要构建步骤 - name: Build supervisor image pull: if-not-exists - image: plugins/docker:20.10 + image: plugins/docker:20.10 # 回退到已知工作的版本 privileged: false + depends_on: [Login to registries] # 确保在登录步骤之后执行 settings: debug: true # 启用调试日志 - login: true dockerfile: Dockerfile auto-tag: true - registry: docker.io - username: - from_secret: dockerhub_username - password: - from_secret: dockerhub_password - # 配置 Harbor 作为推送目标(通过额外的参数) + # 直接配置 Harbor 作为主要注册中心 + registry: harbor.seahi.me repo: harbor.seahi.me/stu/task-supervisor - custom_registries: - - registry: harbor.seahi.me - username: - from_secret: harbor_username - password: - from_secret: harbor_password + username: + from_secret: harbor_username + password: + from_secret: harbor_password