脚本修改

scripts/jenkins-freestyle.sh

@@ -40,8 +40,6 @@ require_command() {
 [[ -n "$ACR_REGISTRY" ]] || fail "ACR_REGISTRY 不能为空"
 [[ "$ACR_REGISTRY" != *://* ]] || fail "ACR_REGISTRY 只填写域名，不要包含协议"
 [[ -n "$ACR_NAMESPACE" ]] || fail "ACR_NAMESPACE 不能为空"
-[[ -n "${ACR_USERNAME:-}" ]] || fail "未绑定 Jenkins ACR 用户名变量 ACR_USERNAME"
-[[ -n "${ACR_PASSWORD:-}" ]] || fail "未绑定 Jenkins ACR 密码变量 ACR_PASSWORD"
 
 case "$DEPLOY_TO_ACK" in
   true|false) ;;
@@ -64,16 +62,11 @@ API_IMAGE="${ACR_REGISTRY}/${ACR_NAMESPACE}/${API_REPOSITORY}"
 ADMIN_IMAGE="${ACR_REGISTRY}/${ACR_NAMESPACE}/${ADMIN_REPOSITORY}"
 
 test_container=""
-docker_config=""
 
 cleanup() {
   if [[ -n "$test_container" ]]; then
     docker rm --force "$test_container" >/dev/null 2>&1 || true
   fi
-  if [[ -n "$docker_config" && -d "$docker_config" ]]; then
-    docker logout "$ACR_REGISTRY" >/dev/null 2>&1 || true
-    rm -rf -- "$docker_config"
-  fi
 }
 trap cleanup EXIT
 
@@ -104,13 +97,7 @@ docker run --rm \
   "$ADMIN_IMAGE:$IMAGE_TAG" \
   -t
 
-log "登录 ACR 并推送镜像"
-docker_config="$(mktemp -d)"
-export DOCKER_CONFIG="$docker_config"
-printf '%s' "$ACR_PASSWORD" | docker login \
-  --username "$ACR_USERNAME" \
-  --password-stdin \
-  "$ACR_REGISTRY"
+log "推送镜像"
 docker push "$API_IMAGE:$IMAGE_TAG"
 docker push "$ADMIN_IMAGE:$IMAGE_TAG"