evolix
/
ansible-roles
18
2
Fork 2
Code Issues 61 Pull Requests 18 Releases 32 Wiki Activity

Fix problems with docker-host daemon.json config
gitea/ansible-roles/pipeline/head This commit looks good Details 

Docker is very strict with it's json format and doesnt
seem to allow any surprise new lines or extra commas
after the last option before the closing }.

Since this is a dynamically constructed file, we dont know
what the last option will be. By putting the commas at the
start of the line and removing all newspace, we remove
the problem, at the expense of a less readable jinja
template.
This commit is contained in:
Patrick Marchand 2023-01-10 15:16:30 -05:00
parent 08db5a5140
commit 0413f93852
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
docker-host/templates/daemon.json.j2
View File

@ -1,38 +1,30 @@
{
"debug": false,
"debug": false
{# Docker data-dir (default to /var/lib/docker) #}
"data-root": "{{ docker_home }}",
,"data-root": "{{ docker_home }}"
{# Keep containers running while docker daemon downtime #}
"live-restore": {{ docker_conf_live_restore | to_json }},
,"live-restore": {{ docker_conf_live_restore | to_json }}
{# Turn on user namespace remaping #}
"userns-remap": "default",
{% if docker_conf_use_iptables %}
,"userns-remap": "default"
{% if docker_conf_use_iptables %}
{# Use iptables instead of docker-proxy #}
"userland-proxy": false,
"iptables": true,
{% endif %}
,"userland-proxy": false
,"iptables": true
{% endif %}
{# Disable the possibility for containers processes to gain new privileges #}
"no-new-privileges": {{ docker_conf_no_newprivileges | to_json }},
{% if docker_conf_disable_default_networking %}
,"no-new-privileges": {{ docker_conf_no_newprivileges | to_json }}
{% if docker_conf_disable_default_networking %}
{# Disable all default network connectivity #}
"bridge": "none",
"icc": false,
{% endif %}
{% if docker_tls_enabled %}
"tls": true,
"tlscert": "{{ docker_tls_path }}/{{ docker_tls_cert }}",
"tlscacert": "{{ docker_tls_path }}/{{ docker_tls_ca }}",
"tlskey": "{{ docker_tls_path }}/{{ docker_tls_key }}",
{% endif %}
{% if docker_remote_access_enabled %}
"hosts": ["tcp://{{ docker_daemon_listening_ip }}:{{ docker_daemon_port }}", "fd://"]
{% endif %}
,"bridge": "none"
,"icc": false
{% endif %}
{% if docker_tls_enabled %}
,"tls": true
,"tlscert": "{{ docker_tls_path }}/{{ docker_tls_cert }}"
,"tlscacert": "{{ docker_tls_path }}/{{ docker_tls_ca }}"
,"tlskey": "{{ docker_tls_path }}/{{ docker_tls_key }}"
{% endif %}
{% if docker_remote_access_enabled %}
,"hosts": ["tcp://{{ docker_daemon_listening_ip }}:{{ docker_daemon_port }}", "fd://"]
{% endif %}
}