diff --git a/build-push-acr.sh b/build-push-acr.sh index 2595930..55179cb 100755 --- a/build-push-acr.sh +++ b/build-push-acr.sh @@ -44,7 +44,7 @@ Required: Optional: ENV_FILE env file to load (default: ../deploy/.env if exists) - ACR_USERNAME if set (recommended), script will docker login before pushing + ACR_USERNAME default: aipper@qq.com REPO_URL registry host (ACR). Default: registry.cn-hangzhou.aliyuncs.com NAMESPACE ACR namespace. Default: aipper REPO_NAME repository name. Default: digital-archive-server @@ -85,6 +85,7 @@ export IMAGE_TAG="${IMAGE_TAG:-$(date +"%Y%m%d%H%M")}" export ACR_REGISTRY="${ACR_REGISTRY:-$REPO_URL}" export ACR_NAMESPACE="${ACR_NAMESPACE:-$NAMESPACE}" export IMAGE_REPO="${IMAGE_REPO:-$REPO_NAME}" +export ACR_USERNAME="${ACR_USERNAME:-aipper@qq.com}" if [[ -z "${ACR_PASSWORD:-}" ]]; then echo "错误:请在运行脚本时传递密码,例如:bash build-push-acr.sh your-acr-password" >&2 @@ -103,11 +104,7 @@ if [[ "${DRY_RUN:-}" == "1" ]]; then exit 0 fi -if [[ -n "${ACR_USERNAME:-}" ]]; then - printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin -else - echo "提示:未设置 ACR_USERNAME,将跳过 docker login(若你本机已登录则可继续 push)" >&2 -fi +printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin if docker buildx version >/dev/null 2>&1; then docker buildx build \