From 07c10ae46d0615ac8e8d2e3a8018114ef90c4d24 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 29 Oct 2020 18:37:10 +1000 Subject: [PATCH] docker-ce: Added mkdir for alt_config_file Signed-off-by: Gerard Ryan --- utils/docker-ce/files/dockerd.init | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/docker-ce/files/dockerd.init b/utils/docker-ce/files/dockerd.init index a40689747..b171220d1 100755 --- a/utils/docker-ce/files/dockerd.init +++ b/utils/docker-ce/files/dockerd.init @@ -6,7 +6,8 @@ START=25 extra_command "uciadd" "Add default bridge configuration to network and firewall uci config" extra_command "ucidel" "Delete default bridge configuration from network and firewall uci config" -DOCKERD_CONF="/tmp/dockerd/daemon.json" +DOCKER_CONF_DIR="/tmp/dockerd" +DOCKERD_CONF="${DOCKER_CONF_DIR}/daemon.json" uci_quiet() { uci -q "${@}" >/dev/null @@ -112,14 +113,16 @@ ucidel() { process_config() { local alt_config_file data_root log_level bip - rm -f "${DOCKERD_CONF}" - [ -f /etc/config/dockerd ] || { # Use the daemon default configuration DOCKERD_CONF="" return 0 } + # reset configuration + rm -fr "${DOCKER_CONF_DIR}" + mkdir -p "${DOCKER_CONF_DIR}" + config_load 'dockerd' config_get alt_config_file globals alt_config_file @@ -144,7 +147,6 @@ process_config() { config_list_foreach globals hosts json_add_array_string json_close_array - mkdir -p /tmp/dockerd json_dump > "${DOCKERD_CONF}" uciupdate "${bip}"