Skip to content

Commit 391b508

Browse files
committed
remove docker cn registry
1 parent 6b952cb commit 391b508

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

docs/guide/gitlab/gitlab-install.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ docker run --detach \\
2020
--volume /srv/gitlab/config:/etc/gitlab \\
2121
--volume /srv/gitlab/logs:/var/log/gitlab \\
2222
--volume /srv/gitlab/data:/var/opt/gitlab \\
23-
registry.docker-cn.com/gitlab/gitlab-ce:11.2.2-ce.0
23+
docker.mirrors.ustc.edu.cn/gitlab/gitlab-ce:11.2.2-ce.0
2424
EOF
2525
```
2626
执行启动脚本:`sh gitlab-setup.sh` 执行成功后,等待数分钟可以看到
2727

2828
```
2929
$ docker ps -a
3030
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
31-
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
31+
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
3232
```
3333
## 配置 gitlab
3434

docs/setup/03-install_docker.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ WantedBy=multi-user.target
4747

4848
``` bash
4949
{
50-
"registry-mirrors": ["https://registry.docker-cn.com"],
50+
"registry-mirrors": ["https://docker.mirrors.ustc.edu.cn"],
5151
"max-concurrent-downloads": 10,
5252
"log-driver": "json-file",
5353
"log-level": "warn",

roles/docker/defaults/main.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# 国内镜像加速
22

3-
REG_MIRROR_1: "https://registry.docker-cn.com"
4-
REG_MIRROR_2: "https://docker.mirrors.ustc.edu.cn"
3+
REG_MIRROR_1: "https://docker.mirrors.ustc.edu.cn"
54

65
# docker日志相关
76

roles/docker/templates/daemon.json.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"registry-mirrors": ["{{ REG_MIRROR_1 }}", "{{ REG_MIRROR_2 }}"],
2+
"registry-mirrors": ["{{ REG_MIRROR_1 }}"],
33
"max-concurrent-downloads": 10,
44
"log-driver": "{{ LOG_DRIVER }}",
55
"log-level": "{{ LOG_LEVEL }}",

0 commit comments

Comments
 (0)