diff --git a/.drone.yml b/.drone.yml index c15586e..d6ddf4a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -245,16 +245,17 @@ steps: from_secret: aliyun_acr_username # 阿里云访问凭证用户名 ACR_PASS: from_secret: aliyun_acr_password # 阿里云访问凭证密码 - ACR_REGISTRY: registry.cn-beijing.aliyuncs.com/yinzy/cicd + ACR_REGISTRY: registry.cn-beijing.aliyuncs.com ACR_NAMESPACE: yinzy + ACR_REPO: cicd commands: - - docker login $ACR_REGISTRY -u "$ACR_USER" -p "$ACR_PASS" - # 后端:将本地镜像打 tag 并推送 - - docker tag ${DRONE_REPO_NAME}:latest $ACR_REGISTRY/$ACR_NAMESPACE/cicd:back-${DRONE_TAG} - - docker push $ACR_REGISTRY/$ACR_NAMESPACE/cicd:back-${DRONE_TAG} - # 前端:将本地镜像打 tag 并推送 - - docker tag ${DRONE_REPO_NAME}-frontend:latest $ACR_REGISTRY/$ACR_NAMESPACE/cicd:front-${DRONE_TAG} - - docker push $ACR_REGISTRY/$ACR_NAMESPACE/cicd:front-${DRONE_TAG} + - echo "$ACR_PASS" | docker login $ACR_REGISTRY -u "$ACR_USER" --password-stdin + # 后端 + - docker tag ${DRONE_REPO_NAME}:latest $ACR_REGISTRY/$ACR_NAMESPACE/$ACR_REPO:back-${DRONE_TAG} + - docker push $ACR_REGISTRY/$ACR_NAMESPACE/$ACR_REPO:back-${DRONE_TAG} + # 前端 + - 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 - frontend_docker_build