Rx3-Docker/docker_tools
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

- Remove ${service_name} == ${APPL_NAME} exption hangling of *_IMG_URL.

Browse Source
This commit is contained in:
Arnaud G. GIBERT 2025-03-31 11:16:52 +02:00
parent 4e2f7b927d
commit eebfc99b24
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ReleaseNotes.txt
View File

@ -1,3 +1,11 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Docker Tools V 1.3.7 - A. GIBERT - 2025/01/xx
------------------------------------------------------------------------------------------------------------------------------------
- Remove ${service_name} == ${APPL_NAME} exption hangling of *_IMG_URL.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Docker Tools V 1.3.6 - A. GIBERT - 2025/01/31 Rx3-Docker/Docker Tools V 1.3.6 - A. GIBERT - 2025/01/31
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

16
sbin/docker_mk_env
View File

@ -3,12 +3,12 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# #
# DOCKER_TOOLS_DEBUG= TRUE | FALSE # Enable debugging (Default FALSE) # DOCKER_TOOLS_DEBUG= TRUE | FALSE # Enable debugging (Default FALSE)
# #
# DOCKER_TOOLS_VOLUME= SINGLE | MERGED | SPLITED # Default: SPLITED # DOCKER_TOOLS_VOLUME= SINGLE | MIXED | MERGED | SPLITED # Default: SPLITED
# SINGLE: Merged volume mode + No service suffix # SINGLE: Merged volume mode + No service suffix
# MIXED: Merged volume mode + Init/SV log Service suffix # MIXED: Merged volume mode + Init/SV log Service suffix
# MERGED: Merged volume mode + Full service suffix # MERGED: Merged volume mode + Full service suffix
# SPLITED: By service volume mode + No service suffix # SPLITED: By service volume mode + No service suffix
# #
# DOCKER_TOOLS_EXEPTION_LIBS="module_name:lib_dir_name ..." # DOCKER_TOOLS_EXEPTION_LIBS="module_name:lib_dir_name ..."
@ -17,7 +17,7 @@
# DOCKER_TOOLS_EXEPTION_LOGS="module_name:log_dir_name ..." # DOCKER_TOOLS_EXEPTION_LOGS="module_name:log_dir_name ..."
# Example: "postgres:web-server:httpd" # Example: "postgres:web-server:httpd"
# #
# DOCKER_TOOLS_USER_GROUP_FORCE= TRUE | FALSE # Force using curent user / group (Default FALSE) # DOCKER_TOOLS_USER_GROUP_FORCE= TRUE | FALSE # Force using curent user / group (Default FALSE)
# #
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -140,10 +140,10 @@ function docker_service_add
if [[ "${service_name}" == "${APPL_NAME}" ]] if [[ "${service_name}" == "${APPL_NAME}" ]]
then then
dynvar_export "${varible_prefix}_IMG_URL" "${target_url_prefix}:${target_version}" # dynvar_export "${varible_prefix}_IMG_URL" "${target_url_prefix}:${target_version}"
dynvar_export "${varible_prefix}_HOST_NAME" "$( psfix_cat "${HOST_NAME_PREFIX}" "-" "webapp")" dynvar_export "${varible_prefix}_HOST_NAME" "$( psfix_cat "${HOST_NAME_PREFIX}" "-" "webapp")"
else else
dynvar_export "${varible_prefix}_IMG_URL" "${target_url_prefix}/${target_name}:${target_version}" # dynvar_export "${varible_prefix}_IMG_URL" "${target_url_prefix}/${target_name}:${target_version}"
dynvar_export "${varible_prefix}_HOST_NAME" "$( psfix_cat "${HOST_NAME_PREFIX}" "-" "${service_name}")" dynvar_export "${varible_prefix}_HOST_NAME" "$( psfix_cat "${HOST_NAME_PREFIX}" "-" "${service_name}")"
fi fi