[fix:6.0]针对aliyun容器服务器，修改默认仓库地址；修改默认源服务器为aliyun

Dockerfile

@@ -1,11 +1,12 @@
-# Ver: 1.3 by Endial Fang (endial@126.com)
+# Ver: 1.4 by Endial Fang (endial@126.com)
 #
 
 # 预处理 =========================================================================
-FROM colovu/dbuilder as builder
+ARG registry_url="registry.cn-shenzhen.aliyuncs.com"
+FROM ${registry_url}/colovu/dbuilder as builder
 
 # sources.list 可使用版本：default / tencent / ustc / aliyun / huawei
-ARG apt_source=default
+ARG apt_source=aliyun
 
 # 编译镜像时指定用于加速的本地服务器地址
 ARG local_url=""
@@ -13,7 +14,10 @@ ARG local_url=""
 ENV APP_NAME=redis \
 	APP_VERSION=6.0.8
 
+# 选择软件包源(Optional)，以加速后续软件包安装
 RUN select_source ${apt_source};
+
+# 安装依赖的软件包及库(Optional)
 #RUN install_pkg xz-utils
 
 # 下载并解压软件包
@@ -61,10 +65,14 @@ RUN set -eux; \
 		cut -d: -f1 | \
 		sort -u >/usr/local/${APP_NAME}/runDeps;
 
-# 镜像生成 ========================================================================
-FROM colovu/debian:10
 
-ARG apt_source=default
+# 镜像生成 ========================================================================
+FROM ${registry_url}/colovu/debian:10
+
+# sources.list 可使用版本：default / tencent / ustc / aliyun / huawei
+ARG apt_source=aliyun
+
+# 编译镜像时指定用于加速的本地服务器地址
 ARG local_url=""
 
 ENV APP_NAME=redis \

Makefile

@@ -1,7 +1,8 @@
-# Ver: 1.6 by Endial Fang (endial@126.com)
+# Ver: 1.7 by Endial Fang (endial@126.com)
 #
 # 当前 Docker 镜像的编译脚本
 
+registry_url :=registry.cn-shenzhen.aliyuncs.com
 app_name :=colovu/redis
 
 # 生成镜像TAG，类似：
@@ -46,16 +47,6 @@ clean:
 	@echo "Clean all images for current application..."
 	@docker images | grep "$(app_name) " | awk '{print $$3}' | sort -u | xargs -L 1 docker rmi -f
 
-tag:
-	@echo "Add tag: $(local_registory)/$(app_name):latest"
-	@docker tag $(app_name):latest $(local_registory)/$(app_name):latest
-
-push: tag
-	@echo "Push: $(local_registory)/$(app_name):latest"
-	@docker push $(local_registory)/$(app_name):latest
-	@echo "Push: $(app_name):latest"
-	@docker push $(app_name):latest
-
 # 更新所有 colovu 仓库的镜像 
 upgrade: 
 	@echo "Upgrade all images..."

README.md

@@ -15,7 +15,7 @@
 
 **镜像信息：**
 
-* 镜像地址：colovu/redis:latest
+* 镜像地址：registry.cn-shenzhen.aliyuncs.com/colovu/redis:6.0
 
 
 
@@ -24,7 +24,7 @@
 Docker 快速启动命令：
 
 ```shell
-$ docker run -d -e ALLOW_ANONYMOUS_LOGIN=yes colovu/redis
+$ docker run -d -e ALLOW_ANONYMOUS_LOGIN=yes registry.cn-shenzhen.aliyuncs.com/colovu/redis:6.0
 ```
 
 Docker-Compose 快速启动命令：
@@ -171,8 +171,8 @@ services:
 
 ## 历史记录
 
-- 2020.9.11：更新 Redis 版本为 6.0.8
-
+- 2020.9.11： 更新 Redis 版本为 6.0.8
+- 2020.9.11： 更新 Redis 版本为 5.0.9
 
 ----
 

docker-compose-replicate.yml

@@ -4,7 +4,7 @@ version: '3.8'
 
 services:
   redis:
-    image: 'colovu/redis:6.0'
+    image: 'registry.cn-shenzhen.aliyuncs.com/colovu/redis:6.0'
     ports:
       - '6379'
     environment:
@@ -15,7 +15,7 @@ services:
       - 'redis_data:/srv/data'
 
   redis-replica:
-    image: 'colovu/redis:6.0'
+    image: 'registry.cn-shenzhen.aliyuncs.com/colovu/redis:6.0'
     ports:
       - '6379'
     environment:

docker-compose.yml

@@ -4,7 +4,7 @@ version: '3.8'
 # 更多配置参数请参考镜像 README.md 文档中说明
 services:
   redis:
-    image: 'colovu/redis:6.0'
+    image: 'registry.cn-shenzhen.aliyuncs.com/colovu/redis:6.0'
     ports:
       - '6379:6379'
     environment: