diff --git a/Dockerfile b/Dockerfile index ef50ad5..bdfd634 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,12 +16,12 @@ # 该部分变量,在编译命令中通过 `--build-arg` 传入;如果未设置,则使用下面对应的默认值 ARG APP_NAME=debian -ARG APP_VER=12 +ARG APP_VER=13 ARG REGISTRY_URL="docker.io/" ARG APT_SOURCE=aliyun # 1. 生成镜像 ===================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}debian:${APP_VER}-slim +FROM ${REGISTRY_URL}debian:${APP_VER}-slim # 声明需要使用的全局可变参数(ARG声明的变量仅编译打包阶段有效) ARG APP_NAME @@ -41,7 +41,7 @@ LABEL org.opencontainers.image.title="${APP_NAME}" \ maintainer="Endial Fang " # 拷贝源仓库配置文件 -COPY etc /etc/ +COPY customer / # 拷贝默认的通用脚本文件 COPY .ci/common/debian / @@ -49,7 +49,7 @@ COPY .ci/common/debian / # 选择软件包源,安装常用软件包,配置locale和时区,并清理缓存 RUN set -eux; \ \ - # 选择软件包源,以加速后续软件包安装 + # 选择软件包源,以加速后续软件包安装 select_source ${APT_SOURCE}; \ \ # 使用 install_pkg 脚本安装软件包 diff --git a/etc/apt/sources/aliyun.sources b/customer/etc/apt/sources/aliyun.sources similarity index 100% rename from etc/apt/sources/aliyun.sources rename to customer/etc/apt/sources/aliyun.sources diff --git a/etc/apt/sources/default.sources b/customer/etc/apt/sources/default.sources similarity index 100% rename from etc/apt/sources/default.sources rename to customer/etc/apt/sources/default.sources diff --git a/etc/apt/sources/ustc.sources b/customer/etc/apt/sources/ustc.sources similarity index 100% rename from etc/apt/sources/ustc.sources rename to customer/etc/apt/sources/ustc.sources