diff --git a/Makefile b/Makefile
index bca6467..8755c75 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,38 @@
-# Ver: 1.7 by Endial Fang (endial@126.com)
+# Ver: 1.9 by Endial Fang (endial@126.com)
 #
 # 当前 Docker 镜像的编译脚本
 
-registry_url :=registry.cn-shenzhen.aliyuncs.com
-app_name := colovu/debian
+# 定义镜像名称
+image_name :=colovu/debian
 
-# 生成镜像TAG，类似：
-# 	<镜像名>:<分支名>-<Git ID>		# Git 仓库且无文件修改直接编译 	
+# 定义默认镜像仓库地址
+registry_url :=registry.cn-shenzhen.aliyuncs.com
+
+# 定义系统默认使用的源服务器，包含：default / tencent / ustc / aliyun / huawei
+apt_source :=aliyun
+
+# 定义镜像TAG，类似：
+# 	<镜像名>:<分支名>-<7位Git ID>		# Git 仓库且无文件修改直接编译 	
 # 	<镜像名>:<分支名>-<年月日>-<时分秒>		# Git 仓库有文件修改后的编译
 # 	<镜像名>:latest-<年月日>-<时分秒>		# 非 Git 仓库编译
 current_subversion:=$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --short HEAD; else date +%y%m%d-%H%M%S; fi)
-current_tag:=local-$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --abbrev-ref HEAD | sed -e 's/master/latest/'; else echo "latest"; fi)-$(current_subversion)
+image_tag:=$(shell if [ ! `git status >/dev/null 2>&1` ]; then git rev-parse --abbrev-ref HEAD | sed -e 's/master/latest/'; else echo "latest"; fi)-$(current_subversion)
 
-# Sources List: default / tencent / ustc / aliyun / huawei
-build-arg:=--build-arg apt_source=aliyun
+build-arg:=--build-arg registry_url=$(registry_url)
+build-arg+=--build-arg apt_source=$(apt_source)
 
 # 设置本地下载服务器路径，加速调试时的本地编译速度
-local_ip:=`echo "en0 eth0" |xargs -n1 ip addr show 2>/dev/null|grep inet|grep -v 127.0.0.1|grep -v inet6|tr "/" " "|awk '{print $$2}'`
+local_ip:=`echo "en0 eth0" | xargs -n1 ip addr show 2>/dev/null | grep inet | grep -v 127.0.0.1 | grep -v inet6 | tr "/" " " | awk '{print $$2}'`
 build-arg+=--build-arg local_url=http://$(local_ip)/dist-files
 
 .PHONY: build clean clearclean upgrade
 
 build:
-	@echo "Build $(app_name):$(current_tag)"
-	@docker build --force-rm $(build-arg) -t $(app_name):$(current_tag) .
-	@echo "Add tag: $(app_name):local-latest"
-	@docker tag $(app_name):$(current_tag) $(app_name):local-latest
+	@echo "Build $(image_name):$(image_tag)"
+	@docker build --force-rm $(build-arg) -t $(image_name):$(image_tag) .
+	@echo "Add tag: $(image_name):latest"
+	@docker tag $(image_name):$(image_tag) $(image_name):latest
+	@echo "Build complete"
 
 # 清理悬空的镜像（无TAG）及停止的容器 
 clearclean: clean
@@ -36,7 +43,7 @@ clearclean: clean
 # 为了防止删除前缀名相同的镜像，在过滤条件中加入一个空格进行过滤
 clean:
 	@echo "Clean all images for current application..."
-	@docker images | grep "$(app_name) " | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f
+	@docker images | grep "$(image_name) " | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f
 
 # 更新所有 colovu 仓库的镜像 
 upgrade: