From eebfc99b24c2d1f50afc73910d8fe07df3d07bcc Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 31 Mar 2025 11:16:52 +0200 Subject: [PATCH] - Remove ${service_name} == ${APPL_NAME} exption hangling of *_IMG_URL. --- ReleaseNotes.txt | 8 ++++++++ sbin/docker_mk_env | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 07a6b55..ff9d20f 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/sbin/docker_mk_env b/sbin/docker_mk_env index c6c6e42..9069dc4 100755 --- a/sbin/docker_mk_env +++ b/sbin/docker_mk_env @@ -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 -# SINGLE: Merged volume mode + No service suffix -# MIXED: Merged volume mode + Init/SV log Service suffix -# MERGED: Merged volume mode + Full service suffix +# DOCKER_TOOLS_VOLUME= SINGLE | MIXED | MERGED | SPLITED # Default: SPLITED +# SINGLE: Merged volume mode + No service suffix +# MIXED: Merged volume mode + Init/SV log Service suffix +# MERGED: Merged volume mode + Full service suffix # SPLITED: By service volume mode + No service suffix # # DOCKER_TOOLS_EXEPTION_LIBS="module_name:lib_dir_name ..." @@ -17,7 +17,7 @@ # DOCKER_TOOLS_EXEPTION_LOGS="module_name:log_dir_name ..." # 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}" ]] 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")" 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}")" fi