diff --git a/Dockerfile b/Dockerfile index cc3db05..90e1306 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,8 @@ FROM alpine:3.12 ARG apt_source=default ARG local_url="" +ENV APP_NAME=alpine-base + LABEL "Version"="v3.12" \ "Description"="Alpine image for Alpine 3.12." \ "Dockerfile"="https://github.com/colovu/docker-alpine" \ diff --git a/prebuilds/usr/local/scripts/liblog.sh b/prebuilds/usr/local/scripts/liblog.sh index 36bae05..f67c4d4 100644 --- a/prebuilds/usr/local/scripts/liblog.sh +++ b/prebuilds/usr/local/scripts/liblog.sh @@ -5,6 +5,7 @@ set +x MODULE="$(basename "$0")" +APPNAME="${APP_NAME:-}" RESET='\033[0m' BOLD='\033[1m' @@ -41,7 +42,7 @@ stderr_print() { # $1 - 日志类型 # $2 - 日志信息 LOG() { - stderr_print "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N")}${RESET} ${*}" + stderr_print "${CYAN}${APP_NAME:-}${ENV_DEBUG:+\:${MODULE:-} ${MAGENTA}$(date "+%T")}${RESET} ${*}" } # 输出调试类日志信息,尽量少使用 diff --git a/prebuilds/usr/sbin/download_pkg b/prebuilds/usr/sbin/download_pkg index 7d1cba4..ca216c4 100755 --- a/prebuilds/usr/sbin/download_pkg +++ b/prebuilds/usr/sbin/download_pkg @@ -110,14 +110,15 @@ cd $INSTALL_ROOT LOG_I "Downloading $PACKAGE package" for url in $PACKAGE_URLS; do - LOG_D "Try $url/$PACKAGE" + LOG_D "Try $url/$PACKAGE" if wget -O "$CACHE_ROOT/$PACKAGE" "$url/$PACKAGE" && [ -s "$CACHE_ROOT/$PACKAGE" ]; then if [ -n "${PACKAGE_KEYS:-}" ]; then - wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.asc" || wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.sign" - if [ -e "$CACHE_ROOT/$PACKAGE.asc" ]; then - break + wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.asc" || wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.sign" || : + if [ ! -e "$CACHE_ROOT/$PACKAGE.asc" ]; then + exit 1 fi fi + break fi done