From 5f0461ed86dd7b51aafe057041390207aa8716ca Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Thu, 3 Aug 2023 12:30:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=AE=9A=E4=B9=89=E5=8F=8A=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E8=B0=83=E7=94=A8(APP=5FNAME/APP=5FVER)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hooks/build | 2 +- prebuilds/usr/local/scripts/libcommon.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hooks/build b/hooks/build index 51964a9..5950352 100644 --- a/hooks/build +++ b/hooks/build @@ -4,4 +4,4 @@ # 用户 docker.hub 的自动编译钩子文件，相应的变量在镜像库自动编译界面进行配置（如：registry_url、apt_source） # 参见： https://docs.docker.com/docker-hub/builds/advanced/ -docker build --build-arg registry_url=${registry_url:-docker.io} --build-arg apt_source=${apt_source:-default} -f $DOCKERFILE_PATH -t $IMAGE_NAME . +docker build --build-arg REGISTRY_URL=${registry_url:-docker.io} --build-arg APT_SOURCE=${apt_source:-default} -f $DOCKERFILE_PATH -t $IMAGE_NAME . diff --git a/prebuilds/usr/local/scripts/libcommon.sh b/prebuilds/usr/local/scripts/libcommon.sh index ae65b41..08234ce 100644 --- a/prebuilds/usr/local/scripts/libcommon.sh +++ b/prebuilds/usr/local/scripts/libcommon.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Ver: 1.3 by Endial Fang (endial@126.com) +# Ver: 1.4 by Endial Fang (endial@126.com) # # 通用函数库 @@ -10,14 +10,14 @@ # 打印包含包含Logo的欢迎信息 print_welcome_info() { - [[ -n "${APP_NAME}" ]] && github_url="/docker-${APP_NAME}" + [[ -n "${APP_NAME}" ]] && github_repo="https://github.com/colovu/docker-${APP_NAME}" LOG_I ' ____ _ ' LOG_I ' / ___|___ | | _____ ___ _ ' LOG_I '| | / _ \| |/ _ \ \ / / | | | '"Docker : ${BOLD}${APP_NAME:-undefined}${RESET}" - LOG_I '| |__| (_) | | (_) \ V /| |_| | '"Version: ${BOLD}${APP_VERSION:-0.0}${RESET}" + LOG_I '| |__| (_) | | (_) \ V /| |_| | '"Version: ${BOLD}${APP_VER:-0.0}${RESET}" LOG_I ' \____\___/|_|\___/ \_/ \__,_| '"PowerBy: ${BOLD}Endial@126.com${RESET}" - LOG_D " Project Repo: https://github.com/colovu/${github_url:-}" + LOG_D " Project Repo: ${github_repo:-}" LOG_I "" }