Browse Source

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
changes/96/625596/1
Jens Harbott 6 months ago
parent
commit
b43e406edd
1 changed files with 1 additions and 10 deletions
  1. 1
    10
      roles/install-docker/tasks/mirror.yaml

+ 1
- 10
roles/install-docker/tasks/mirror.yaml View File

@@ -4,22 +4,13 @@
4 4
     state: directory
5 5
     path: /etc/docker
6 6
 
7
-- name: Set docker_mirror fact for upstream docker
7
+- name: Set docker_mirror fact
8 8
   when:
9 9
     - docker_mirror is not defined
10 10
     - mirror_fqdn is defined
11
-    - use_upstream_docker
12 11
   set_fact:
13 12
     docker_mirror: "http://{{ mirror_fqdn }}:8082"
14 13
 
15
-- name: Set docker_mirror fact for distro docker
16
-  when:
17
-    - docker_mirror is not defined
18
-    - mirror_fqdn is defined
19
-    - not use_upstream_docker
20
-  set_fact:
21
-    docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/"
22
-
23 14
 - name: Install dockerhub proxy configuration
24 15
   become: yes
25 16
   when:

Loading…
Cancel
Save