Browse Source

Merge "Add docker insecure registries feature"

changes/34/634934/3
Zuul 5 months ago
parent
commit
4f71cfa849
2 changed files with 8 additions and 0 deletions
  1. 7
    0
      roles/install-docker/README.rst
  2. 1
    0
      roles/install-docker/templates/daemon.json.j2

+ 7
- 0
roles/install-docker/README.rst View File

@@ -32,3 +32,10 @@ An ansible role to install docker and configure it to use mirrors if available.
32 32
    Undefined will install the latest.  This will look something like
33 33
    ``18.06.1~ce~3-0~ubuntu``.  Only supported when using upstream
34 34
    docker repos.
35
+
36
+.. zuul:rolevar:: docker_insecure_registries
37
+   :default: undefined
38
+
39
+   Declare this with a list of insecure registries to define the
40
+   registries which are allowed to communicate with HTTP only or
41
+   HTTPS with no valid certificate.

+ 1
- 0
roles/install-docker/templates/daemon.json.j2 View File

@@ -1,3 +1,4 @@
1 1
 {
2
+  {% if docker_insecure_registries is defined -%}"insecure-registries": {{ docker_insecure_registries | to_json }},{% endif %}
2 3
   "registry-mirrors": ["{{ docker_mirror }}"]
3 4
 }

Loading…
Cancel
Save