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

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

Browse source
This commit is contained in:
Patrick Marchand 2023-01-10 11:26:57 -05:00
parent e5cae4ba78
commit 08db5a5140
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
* Proper jinja spacing * Proper jinja spacing
* evolinux-base: ensure dbus is started and enabled (not by default in the case of an offline netinst) * evolinux-base: ensure dbus is started and enabled (not by default in the case of an offline netinst)
* elasticsearch : use logrotate for garbage collector logs instead of breaking compression cron * elasticsearch : use logrotate for garbage collector logs instead of breaking compression cron
* docker-host: fix type in daemon.json and remove host configuration that is already in the systemd service by default
### Removed ### Removed

4
docker-host/templates/daemon.json.j2
View file

@ -5,7 +5,7 @@
"data-root": "{{ docker_home }}", "data-root": "{{ docker_home }}",
{# Keep containers running while docker daemon downtime #} {# 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 #} {# Turn on user namespace remaping #}
"userns-remap": "default", "userns-remap": "default",
@ -34,7 +34,5 @@
{% if docker_remote_access_enabled %} {% if docker_remote_access_enabled %}
"hosts": ["tcp://{{ docker_daemon_listening_ip }}:{{ docker_daemon_port }}", "fd://"] "hosts": ["tcp://{{ docker_daemon_listening_ip }}:{{ docker_daemon_port }}", "fd://"]
{% else %}
"hosts": ["fd://"]
{% endif %} {% endif %}
} }