diff --git a/Dockerfile b/Dockerfile index b522134..2e26892 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,35 +36,35 @@ FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}library/alpine:${A # 声明需要使用的全局可变参数 ARG APP_NAME ARG APP_VER -ARG REGISTRY_URL ARG APT_SOURCE -ARG LOCAL_URL -ARG TARGETARCH LABEL \ "Version"="v${APP_VER}" \ "Description"="Docker image for Alpine." \ - "Github"="https://github.com/colovu/docker-alpine" \ + "Github"="https://github.com/colovu/docker-${APP_NAME}" \ "Vendor"="Endial Fang (endial@126.com)" # 拷贝默认的通用脚本文件 COPY prebuilds / -# 选择软件包源(Optional),以加速后续软件包安装 -RUN select_source ${APT_SOURCE} - -# 增加musl版本的locales支持,并设置默认为 UTF-8 -RUN apk add --no-cache libintl; \ +RUN \ + # 选择软件包源(Optional),以加速后续软件包安装 + select_source ${APT_SOURCE}; \ + \ + # 安装常用的软件包 + install_pkg bash tzdata curl; \ + \ + # 配置时区默认为 Shanghai + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + \ + # 增加 musl 版本的 locales 支持,并设置默认为 UTF-8 + apk add --no-cache libintl; \ apk add --no-cache --virtual .locale_build git cmake make musl-dev gcc gettext-dev; \ git clone https://gitlab.com/rilian-la-te/musl-locales; \ cd musl-locales && cmake -DLOCALE_PROFILE=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr . && make && make install; \ cd .. && rm -r musl-locales; \ apk del .locale_build; \ rm -rf /var/cache/apk/*; - -# 配置时区默认为 Shanghai -RUN install_pkg bash tzdata curl; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \