From 08db5a5140f39a591f50a63d87faf027afeebba6 Mon Sep 17 00:00:00 2001 From: Patrick Marchand Date: Tue, 10 Jan 2023 11:26:57 -0500 Subject: [PATCH] Fix problems with docker-host daemon.json config --- CHANGELOG.md | 1 + docker-host/templates/daemon.json.j2 | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f9491d0..fba9fb49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * Proper jinja spacing * 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 +* docker-host: fix type in daemon.json and remove host configuration that is already in the systemd service by default ### Removed diff --git a/docker-host/templates/daemon.json.j2 b/docker-host/templates/daemon.json.j2 index 08dcb1b2..f144d543 100644 --- a/docker-host/templates/daemon.json.j2 +++ b/docker-host/templates/daemon.json.j2 @@ -5,7 +5,7 @@ "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", @@ -34,7 +34,5 @@ {% if docker_remote_access_enabled %} "hosts": ["tcp://{{ docker_daemon_listening_ip }}:{{ docker_daemon_port }}", "fd://"] - {% else %} - "hosts": ["fd://"] {% endif %} }