Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -1,5 +1,5 @@
 # 如果nginx无法拉取，可以用下面的镜像：
-# registry.cn-hangzhou.aliyuncs.com/interlock/nginx
+# FROM registry.cn-hangzhou.aliyuncs.com/interlock/nginx:1.0
 FROM nginx
 MAINTAINER jeecgos@163.com
 VOLUME /tmp