Alwas use pathless docker mirror URI
It seems that we need the pathless docker mirror URI for distro docker now, too, so set it unconditionally. Change-Id: Ic6918312ec60efba0397b85ee16d91c6393ee90b
This commit is contained in:
parent
68375810ee
commit
b43e406edd
@ -4,22 +4,13 @@
|
|||||||
state: directory
|
state: directory
|
||||||
path: /etc/docker
|
path: /etc/docker
|
||||||
|
|
||||||
- name: Set docker_mirror fact for upstream docker
|
- name: Set docker_mirror fact
|
||||||
when:
|
when:
|
||||||
- docker_mirror is not defined
|
- docker_mirror is not defined
|
||||||
- mirror_fqdn is defined
|
- mirror_fqdn is defined
|
||||||
- use_upstream_docker
|
|
||||||
set_fact:
|
set_fact:
|
||||||
docker_mirror: "http://{{ mirror_fqdn }}:8082"
|
docker_mirror: "http://{{ mirror_fqdn }}:8082"
|
||||||
|
|
||||||
- name: Set docker_mirror fact for distro docker
|
|
||||||
when:
|
|
||||||
- docker_mirror is not defined
|
|
||||||
- mirror_fqdn is defined
|
|
||||||
- not use_upstream_docker
|
|
||||||
set_fact:
|
|
||||||
docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/"
|
|
||||||
|
|
||||||
- name: Install dockerhub proxy configuration
|
- name: Install dockerhub proxy configuration
|
||||||
become: yes
|
become: yes
|
||||||
when:
|
when:
|
||||||
|
Loading…
Reference in New Issue
Block a user