From 4e2f7b927daadf0f9200e4a8efdea5aad5a4a1c6 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Fri, 31 Jan 2025 16:27:41 +0100
Subject: [PATCH] - Add a new DOCKER_TOOLS_USER_GROUP_FORCE env variable
 support.

---
 ReadMe.txt         |  5 +++--
 ReleaseNotes.txt   |  8 ++++++++
 sbin/docker_mk_env | 12 ++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index 3b59bed..ae17516 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -13,8 +13,9 @@ Features:
 
 Support different mounted volume modes:
     - Single,
-    - Merged, (Old mode)
-    - Splited. (Default)
+    - Mixed (Old mode),
+    - Merged,
+    - Splited (Default).
 
 
 Enjoy it!
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index dd76def..07a6b55 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,11 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.3.6 - A. GIBERT - 2025/01/31
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add a new DOCKER_TOOLS_USER_GROUP_FORCE env variable support.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/Docker Tools V 1.3.5 - A. GIBERT - 2025/01/24
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/sbin/docker_mk_env b/sbin/docker_mk_env
index 890107c..c6c6e42 100755
--- a/sbin/docker_mk_env
+++ b/sbin/docker_mk_env
@@ -17,6 +17,8 @@
 # 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)
+#
 #-------------------------------------------------------------------------------
 
 set -o errexit
@@ -272,6 +274,11 @@ function docker_service_add
         user_name="-"
         user_id="-"
     else
+        if [[ "${DOCKER_TOOLS_USER_GROUP_FORCE}" == "TRUE" ]]
+        then
+            user_name_id=$( id -u)
+        fi
+        
         if [[ "${user_name_id}" =~ ^[0-9]+$ ]]
         then
             user_name="-"
@@ -291,6 +298,11 @@ function docker_service_add
         group_name="-"
         group_id="-"
     else
+        if [[ "${DOCKER_TOOLS_USER_GROUP_FORCE}" == "TRUE" ]]
+        then
+            group_name_id=$( id -g)
+        fi
+        
         if [[ "${group_name_id}" =~ ^[0-9]+$ ]]
         then
             group_name="-"