fix: default ACR username
This commit is contained in:
@@ -44,7 +44,7 @@ Required:
|
|||||||
|
|
||||||
Optional:
|
Optional:
|
||||||
ENV_FILE env file to load (default: ../deploy/.env if exists)
|
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
|
REPO_URL registry host (ACR). Default: registry.cn-hangzhou.aliyuncs.com
|
||||||
NAMESPACE ACR namespace. Default: aipper
|
NAMESPACE ACR namespace. Default: aipper
|
||||||
REPO_NAME repository name. Default: digital-archive-frontend
|
REPO_NAME repository name. Default: digital-archive-frontend
|
||||||
@@ -87,6 +87,7 @@ export IMAGE_TAG="${IMAGE_TAG:-$(date +"%Y%m%d%H%M")}"
|
|||||||
export ACR_REGISTRY="${ACR_REGISTRY:-$REPO_URL}"
|
export ACR_REGISTRY="${ACR_REGISTRY:-$REPO_URL}"
|
||||||
export ACR_NAMESPACE="${ACR_NAMESPACE:-$NAMESPACE}"
|
export ACR_NAMESPACE="${ACR_NAMESPACE:-$NAMESPACE}"
|
||||||
export IMAGE_REPO="${IMAGE_REPO:-$REPO_NAME}"
|
export IMAGE_REPO="${IMAGE_REPO:-$REPO_NAME}"
|
||||||
|
export ACR_USERNAME="${ACR_USERNAME:-aipper@qq.com}"
|
||||||
|
|
||||||
if [[ -z "${ACR_PASSWORD:-}" ]]; then
|
if [[ -z "${ACR_PASSWORD:-}" ]]; then
|
||||||
echo "错误:请在运行脚本时传递密码,例如:bash build-push-acr.sh your-acr-password" >&2
|
echo "错误:请在运行脚本时传递密码,例如:bash build-push-acr.sh your-acr-password" >&2
|
||||||
@@ -105,11 +106,7 @@ if [[ "${DRY_RUN:-}" == "1" ]]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${ACR_USERNAME:-}" ]]; then
|
printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin
|
||||||
printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin
|
|
||||||
else
|
|
||||||
echo "提示:未设置 ACR_USERNAME,将跳过 docker login(若你本机已登录则可继续 push)" >&2
|
|
||||||
fi
|
|
||||||
|
|
||||||
build_args=()
|
build_args=()
|
||||||
if [[ -n "${PKG_MANAGER:-}" ]]; then
|
if [[ -n "${PKG_MANAGER:-}" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user