diff --git a/defaults/main.yml b/defaults/main.yml index b26ecaf..c21c1f6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,5 +10,5 @@ container_registry_insecure_registries: [] container_registry_network_options: '' container_registry_host: localhost container_registry_port: 8787 -container_registry_mirrors: [] +container_registry_mirror: '' container_registry_storage_options: '-s overlay2' diff --git a/tasks/docker.yml b/tasks/docker.yml index 12708dc..746d65a 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -50,8 +50,8 @@ registry_flags: "{% for reg in container_registry_insecure_registries %}--insecure-registry {{ reg }}{% if not loop.last %} {% endif %}{% endfor %}" - name: manage /etc/docker/daemon.json - copy: - content: "{{ _docker_daemon_config | from_yaml | to_nice_json }}" + template: + src: docker-daemon.json.j2 dest: /etc/docker/daemon.json notify: restart docker service diff --git a/templates/docker-daemon.json.j2 b/templates/docker-daemon.json.j2 new file mode 100644 index 0000000..34d039a --- /dev/null +++ b/templates/docker-daemon.json.j2 @@ -0,0 +1,6 @@ +{ +{% if container_registry_mirror != "" %} + "registry-mirrors": ["{{ container_registry_mirror }}"], +{% endif %} + "debug": {{ container_registry_debug|lower }} +} diff --git a/vars/main.yml b/vars/main.yml index eb7a656..c03e7c3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1 @@ _full_docker_options: "{% if ansible_selinux.status == 'enabled' %}--selinux-enabled {% endif %}{{ container_registry_docker_options }}" -_docker_daemon_config: | - debug: {{ container_registry_debug }} - {% if container_registry_mirrors | length > 0 %}registry-mirrors: [{{ container_registry_mirrors }}]{% endif %}