- Replace ENV_SED by ENV_NET_SED environment variable.

ReleaseNotes.txt

@@ -1,3 +1,20 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.3.4 - A. GIBERT - 2025/01/13
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Replace ENV_SED by ENV_NET_SED environment variable.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -20,7 +37,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

@@ -11,7 +11,10 @@
 #     SPLITED: By service volume mode + No service suffix
 #
 # DOCKER_TOOLS_EXEPTION_LIBS="module_name:lib_dir_name ..."
-#     Example: postgres:pgsq
+#     Example: "postgres:pgsq httpd:/var/www/html"
+#
+# DOCKER_TOOLS_EXEPTION_LOGS="module_name:log_dir_name ..."
+#     Example: "postgres:web-server:httpd"
 #
 #-------------------------------------------------------------------------------
 
@@ -81,6 +84,25 @@ function module_lib_name_get
 
 
 
+#-------------------------------------------------------------------------------
+function module_log_name_get
+{
+       module=$1
+
+       for tup in ${DOCKER_TOOLS_EXEPTION_LOGS}
+       do
+           if [[ "${module}" == "${tup/:*}" ]]
+           then
+               echo ${tup/*:}
+               return
+           fi
+       done
+
+       echo "${module}"
+}
+
+
+
 #-------------------------------------------------------------------------------
 function docker_service_add
 {
@@ -182,9 +204,21 @@ function docker_service_add
         path_prefix=""
     fi
     
-    
     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}")"
     
@@ -198,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
@@ -377,14 +415,26 @@ fi
 
 
 >${APPL_HOME_DIR}/.env
->${APPL_HOME_DIR}/.env.sed
+ENV_SED=""
+ENV_NET_SED=""
 
 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 "s/\${${var}}/${!var//\//\\/}/g" >>${APPL_HOME_DIR}/.env.sed
+
+    
+    pat="s/\${${var}}/${!var//\//\\/}/g
+"
+    ENV_SED="${ENV_SED}${pat}"
+    
+    if [[ ${var} =~ _HOST_ ]] || ( [[ ${var} =~ _PORT_  ]] && [[ ${var} =~ _INT  ]])
+    then
+       ENV_NET_SED="${ENV_NET_SED}${pat}"
+    fi
 done
 
+echo ENV_NET_SED=\'"${ENV_NET_SED}"\'           >>${APPL_HOME_DIR}/.env
+
 
 
 for tupple in ${CONFIG_FILE_LIST}
@@ -397,5 +447,5 @@ do
     IFS=" "
 
 
-    sed <${config_file_source} >${config_file_target} -f ${APPL_HOME_DIR}/.env.sed
+    sed <${config_file_source} >${config_file_target} -e "${ENV_SED}"
 done