easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove docker cn registry

pull/525/head
suxiaolin 2019-04-17 08:57:51 +08:00 committed by jmgao
parent 4fe5305aea
commit 3835d32915
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide/gitlab/gitlab-install.md
View File

@ -20,7 +20,7 @@ docker run --detach \\
--volume /srv/gitlab/config:/etc/gitlab \\ --volume /srv/gitlab/config:/etc/gitlab \\
--volume /srv/gitlab/logs:/var/log/gitlab \\ --volume /srv/gitlab/logs:/var/log/gitlab \\
--volume /srv/gitlab/data:/var/opt/gitlab \\ --volume /srv/gitlab/data:/var/opt/gitlab \\
registry.docker-cn.com/gitlab/gitlab-ce:11.2.2-ce.0 docker.mirrors.ustc.edu.cn/gitlab/gitlab-ce:11.2.2-ce.0
EOF EOF
``` ```
执行启动脚本：`sh gitlab-setup.sh` 执行成功后，等待数分钟可以看到 执行启动脚本：`sh gitlab-setup.sh` 执行成功后，等待数分钟可以看到
@ -28,7 +28,7 @@ EOF
``` ```
$ docker ps -a $ docker ps -a
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
4f9d5f97f494 registry.docker-cn.com/gitlab/gitlab-ce:11.2.2-ce.0 "/assets/wrapper" 9 minutes ago Up 9 minutes (healthy) 0.0.0.0:80->80/tcp, 0.0.0.0:443->443/tcp, 0.0.0.0:6022->22/tcp gitlab 4f9d5f97f494 docker.mirrors.ustc.edu.cn/gitlab/gitlab-ce:11.2.2-ce.0 "/assets/wrapper" 9 minutes ago Up 9 minutes (healthy) 0.0.0.0:80->80/tcp, 0.0.0.0:443->443/tcp, 0.0.0.0:6022->22/tcp gitlab
``` ```
## 配置 gitlab ## 配置 gitlab

2
docs/setup/03-install_docker.md
View File

@ -47,7 +47,7 @@ WantedBy=multi-user.target
``` bash ``` bash
{ {
"registry-mirrors": ["https://registry.docker-cn.com"], "registry-mirrors": ["https://docker.mirrors.ustc.edu.cn"],
"max-concurrent-downloads": 10, "max-concurrent-downloads": 10,
"log-driver": "json-file", "log-driver": "json-file",
"log-level": "warn", "log-level": "warn",

3
roles/docker/defaults/main.yml
View File

@ -1,7 +1,6 @@
# 国内镜像加速 # 国内镜像加速
REG_MIRROR_1: "https://registry.docker-cn.com" REG_MIRROR_1: "https://docker.mirrors.ustc.edu.cn"
REG_MIRROR_2: "https://docker.mirrors.ustc.edu.cn"
# docker日志相关 # docker日志相关

2
roles/docker/templates/daemon.json.j2
View File

@ -1,5 +1,5 @@
{ {
"registry-mirrors": ["{{ REG_MIRROR_1 }}", "{{ REG_MIRROR_2 }}"], "registry-mirrors": ["{{ REG_MIRROR_1 }}"],
"max-concurrent-downloads": 10, "max-concurrent-downloads": 10,
"log-driver": "{{ LOG_DRIVER }}", "log-driver": "{{ LOG_DRIVER }}",
"log-level": "{{ LOG_LEVEL }}", "log-level": "{{ LOG_LEVEL }}",