diff --git a/sbin/docker_mk_env b/sbin/docker_mk_env index e363914..66a8269 100755 --- a/sbin/docker_mk_env +++ b/sbin/docker_mk_env @@ -10,7 +10,7 @@ # MERGED: Merged volume mode + Service suffix # SPLITED: By service volume mode + No service suffix # -# DOCKER_TOOLS_EXECPTION_LIBS="module_name:lib_dir_name ..." +# DOCKER_TOOLS_EXEPTION_LIBS="module_name:lib_dir_name ..." # Example: postgres:pgsq # #------------------------------------------------------------------------------- @@ -24,6 +24,7 @@ fi APPL_HOME_DIR="$(dirname "$(dirname "$0")")" DYNVAR_LIST="APPL_HOME_DIR" +CONFIG_FILE_LIST="" version="$1" @@ -66,7 +67,7 @@ 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 @@ -170,12 +171,26 @@ function docker_service_add else 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} + + 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}")" @@ -334,6 +349,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 @@ -355,3 +382,21 @@ for var in $( ( grep "^ *[a-zA-Z0-9_-]*=" ${APPL_HOME_DIR}/env | sed -e "s/=.*// do echo "${var}='${!var}'" >>${APPL_HOME_DIR}/.env done + + + +for tupple in ${CONFIG_FILE_LIST} +do + IFS=":" + set ${tupple} + + config_file_target="$1" + config_file_source="$2" + IFS=" " + + + while read line + do + eval echo $(echo ${line} | sed -e 's/"/\\"/g' -e 's//\\>/g';) + done <${config_file_source} >${config_file_target} +done