docker-ce: Added mkdir for alt_config_file
authorGerard Ryan <redacted>
Thu, 29 Oct 2020 08:37:10 +0000 (18:37 +1000)
committerGerard Ryan <redacted>
Wed, 11 Nov 2020 08:28:15 +0000 (18:28 +1000)
Signed-off-by: Gerard Ryan <redacted>
utils/docker-ce/files/dockerd.init

index a406897479c069393f2ba8b7e9e3f7c20fa123b8..b171220d11acff2b9ea57f95598281bf1c4e7fbe 100755 (executable)
@@ -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}"
git clone https://git.99rst.org/PROJECT