From 3fbadf827a488854079b931c27cba4b71e574cf8 Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Thu, 1 Jul 2021 14:47:33 +0800
Subject: [PATCH] =?UTF-8?q?[fix:10]=E6=9B=B4=E6=96=B0Dockerfile=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC,=E6=9B=B4=E6=96=B0arg=E4=BD=BF=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b74b4ec..2c16e54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,38 @@
-# Ver: 1.4 by Endial Fang (endial@126.com)
+# Ver: 1.8 by Endial Fang (endial@126.com)
 #
 
-# 预处理 =========================================================================
-ARG registry_url="registry.cn-shenzhen.aliyuncs.com"
-FROM ${registry_url}/colovu/dbuilder as builder
+# 可变参数 ========================================================================
 
-# sources.list 可使用版本：default / tencent / ustc / aliyun / huawei
+# 设置当前应用名称及版本
+ARG app_name=debian-buster
+ARG app_version=10
+
+# 设置默认仓库地址，默认为 阿里云 仓库
+ARG registry_url="registry.cn-shenzhen.aliyuncs.com"
+
+# 设置 apt-get 源：default / tencent / ustc / aliyun / huawei
 ARG apt_source=aliyun
 
 # 编译镜像时指定用于加速的本地服务器地址
 ARG local_url=""
 
-WORKDIR /usr/local
+
+# 0. 预处理 ======================================================================
+FROM ${registry_url}/colovu/dbuilder as builder
+
+# 声明需要使用的全局可变参数
+ARG app_name
+ARG app_version
+ARG registry_url
+ARG apt_source
+ARG local_url
 
 # 选择软件包源(Optional)，以加速后续软件包安装
 RUN select_source ${apt_source};
 
+# 设置工作目录
+WORKDIR /usr/local
+
 # 下载并解压软件包
 RUN set -eux; \
 	appVersion=1.13; \
@@ -28,13 +45,15 @@ RUN set -eux; \
 	download_pkg install ${appName} "${appUrls}" ; \
 	chmod +x /usr/local/bin/${appName};
 
-# 镜像生成 ========================================================================
+# 1. 生成镜像 =====================================================================
 FROM debian:buster-slim
 
-# sources.list 可使用版本：default / tencent / ustc / aliyun / huawei
-ARG apt_source=aliyun
-
-ENV APP_NAME=debian-buster
+# 声明需要使用的全局可变参数
+ARG app_name
+ARG app_version
+ARG registry_url
+ARG apt_source
+ARG local_url
 
 LABEL \
 	"Version"="v10" \
@@ -64,6 +83,7 @@ RUN set -eux; \
 	\
 	ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \
 	dpkg-reconfigure -f noninteractive tzdata; 
+
 ENV LANG=en_US.UTF-8 \
 	LANGUAGE=en_US.UTF-8 \
 	LC_ALL=en_US.UTF-8