- Remove .env.sed file obsoleted by ENV_SED environment variable.

ReleaseNotes.txt

@@ -1,3 +1,20 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.3.3 - A. GIBERT - 2025/01/05
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add DOCKER_TOOLS_EXEPTION_LOGS env variable support,
+- Remove .env.sed file obsoleted by ENV_SED environment variable.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.3.2 - A. GIBERT - 2024/12/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add docker_config_add function for docker_mk_env to support config file generation.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/Docker Tools V 1.3.1 - A. GIBERT - 2024/12/14
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -12,7 +29,7 @@ Rx3-Docker/Docker Tools V 1.3.0 - A. GIBERT - 2024/11/26
 
 - Improve docker_service_add function,
 - Switch by default to splited volume mode, 
-- Add DOCKER_TOOLS_DEBUG, DOCKER_TOOLS_VOLUME & DOCKER_TOOLS_EXECPTION_LIBS env variable support.
+- Add DOCKER_TOOLS_DEBUG, DOCKER_TOOLS_VOLUME & DOCKER_TOOLS_EXEPTION_LIBS env variable support.
 - Warning: API break!
 
 

sbin/docker_mk_env

@@ -10,8 +10,11 @@
 #     MERGED:  Merged volume mode     + Service suffix
 #     SPLITED: By service volume mode + No service suffix
 #
-# DOCKER_TOOLS_EXECPTION_LIBS="module_name:lib_dir_name ..."
-#     Example: postgres:pgsq
+# DOCKER_TOOLS_EXEPTION_LIBS="module_name:lib_dir_name ..."
+#     Example: "postgres:pgsq httpd:/var/www/html"
+#
+# DOCKER_TOOLS_EXEPTION_LOGS="module_name:log_dir_name ..."
+#     Example: "postgres:web-server:httpd"
 #
 #-------------------------------------------------------------------------------
 
@@ -24,6 +27,7 @@ fi
 
 APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
 DYNVAR_LIST="APPL_HOME_DIR"
+CONFIG_FILE_LIST=""
 
 version="$1"
 
@@ -66,7 +70,26 @@ function module_lib_name_get
 {
        module=$1
 
-       for tup in ${DOCKER_TOOLS_EXECPTION_LIBS}
+       for tup in ${DOCKER_TOOLS_EXEPTION_LIBS}
+       do
+           if [[ "${module}" == "${tup/:*}" ]]
+           then
+               echo ${tup/*:}
+               return
+           fi
+       done
+
+       echo "${module}"
+}
+
+
+
+#-------------------------------------------------------------------------------
+function module_log_name_get
+{
+       module=$1
+
+       for tup in ${DOCKER_TOOLS_EXEPTION_LOGS}
        do
            if [[ "${module}" == "${tup/:*}" ]]
            then
@@ -171,11 +194,37 @@ function docker_service_add
         volume_suffix_ext="${service_name}"
     fi
 
+    
     module_lib_name="$( module_lib_name_get "${module_name}")"
 
+    if [[ "${module_lib_name}" != /* ]]
+    then
+        path_prefix="/var/lib/"
+    else
+        path_prefix=""
+    fi
     
-    dynvar_export "${varible_prefix}_LIB_INT"            "/var/lib/${module_lib_name}"
-    dynvar_export "${varible_prefix}_LIB_EXT"            "$( psfix_cat "${volume_prefix}/var/lib/${module_lib_name}" "-" "${volume_suffix_ext}")"
+    module_lib_path=${path_prefix}${module_lib_name}
+
+
+    module_log_name="$( module_log_name_get "${module_name}")"
+
+    if [[ "${module_log_name}" != /* ]]
+    then
+        path_prefix="/var/log/"
+    else
+        path_prefix=""
+    fi
+    
+    module_log_path=${path_prefix}${module_log_name}
+
+    
+    dynvar_export "${varible_prefix}_LIB_INT"            "${module_lib_path}"
+    dynvar_export "${varible_prefix}_LIB_EXT"            "$( psfix_cat "${volume_prefix}${module_lib_path}"          "-" "${volume_suffix_ext}")"
+    
+    
+#    dynvar_export "${varible_prefix}_LIB_INT"            "/var/lib/${module_lib_name}"
+#    dynvar_export "${varible_prefix}_LIB_EXT"            "$( psfix_cat "${volume_prefix}/var/lib/${module_lib_name}" "-" "${volume_suffix_ext}")"
 
     dynvar_export "${varible_prefix}_LOG_INIT_INT"       "/var/log/init"
     dynvar_export "${varible_prefix}_LOG_INIT_EXT"       "$( psfix_cat "${volume_prefix}/var/log/init"               "-" "${volume_suffix_ext}")"
@@ -183,8 +232,12 @@ function docker_service_add
     dynvar_export "${varible_prefix}_LOG_SV_INT"         "/var/log/supervisor"
     dynvar_export "${varible_prefix}_LOG_SV_EXT"         "$( psfix_cat "${volume_prefix}/var/log/supervisor"         "-" "${volume_suffix_ext}")"
 
-    dynvar_export "${varible_prefix}_LOG_MAIN_INT"       "/var/log/${module_name}"
-    dynvar_export "${varible_prefix}_LOG_MAIN_EXT"       "$( psfix_cat "${volume_prefix}/var/log/${module_name}"     "-" "${volume_suffix_ext}")"
+    dynvar_export "${varible_prefix}_LOG_MAIN_INT"       "${module_log_path}"
+    dynvar_export "${varible_prefix}_LOG_MAIN_EXT"       "$( psfix_cat "${volume_prefix}${module_log_path}"          "-" "${volume_suffix_ext}")"
+    
+#    dynvar_export "${varible_prefix}_LOG_MAIN_INT"       "/var/log/${module_name}"
+#    dynvar_export "${varible_prefix}_LOG_MAIN_EXT"       "$( psfix_cat "${volume_prefix}/var/log/${module_name}"     "-" "${volume_suffix_ext}")"
+
     
     
     # Ports
@@ -334,6 +387,18 @@ function docker_service_add-12
 
 
 
+#-------------------------------------------------------------------------------
+function docker_config_add
+{
+    config_file_target="$1"
+    config_file_source="$2"
+
+
+    CONFIG_FILE_LIST+=" ${config_file_target}:${config_file_source}"
+}
+
+
+
 #-------------------------------------------------------------------------------
 
 . ${APPL_HOME_DIR}/env
@@ -353,5 +418,24 @@ fi
 
 for var in $( ( grep "^ *[a-zA-Z0-9_-]*=" ${APPL_HOME_DIR}/env | sed -e "s/=.*//" -e "s/ *//"; echo ${DYNVAR_LIST} | sed -e 's/ /\n/g') | sort -u)
 do
-    echo "${var}='${!var}'" >>${APPL_HOME_DIR}/.env
+    echo "${var}='${!var}'"               >>${APPL_HOME_DIR}/.env
+    ENV_SED="${ENV_SED}s/\${${var}}/${!var//\//\\/}/g
+"
+done
+
+echo ENV_SED=\'"${ENV_SED}"\'           >>${APPL_HOME_DIR}/.env
+
+
+
+for tupple in ${CONFIG_FILE_LIST}
+do
+    IFS=":"
+    set ${tupple}
+
+    config_file_target="$1"
+    config_file_source="$2"
+    IFS=" "
+
+
+    sed <${config_file_source} >${config_file_target} -e "${ENV_SED}"
 done