zuul
/
zuul-jobs
Code Issues Proposed changes

Merge "Add docker insecure registries feature"

This commit is contained in:
Zuul 2019-02-05 16:11:35 +00:00 committed by Gerrit Code Review
parent bb0788ff0c e3e450650b
commit 4f71cfa849
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.
Undefined will install the latest. This will look something like Undefined will install the latest. This will look something like
``18.06.1~ce~3-0~ubuntu``. Only supported when using upstream ``18.06.1~ce~3-0~ubuntu``. Only supported when using upstream
docker repos. docker repos.
.. zuul:rolevar:: docker_insecure_registries
:default: undefined
Declare this with a list of insecure registries to define the
registries which are allowed to communicate with HTTP only or
HTTPS with no valid certificate.

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

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