Compare commits
3 Commits
docker_too
...
docker_too
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b50783d3c | |||
| eebfc99b24 | |||
| 4e2f7b927d |
@@ -13,8 +13,9 @@ Features:
|
|||||||
|
|
||||||
Support different mounted volume modes:
|
Support different mounted volume modes:
|
||||||
- Single,
|
- Single,
|
||||||
- Merged, (Old mode)
|
- Mixed (Old mode),
|
||||||
- Splited. (Default)
|
- Merged,
|
||||||
|
- Splited (Default).
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
|
|||||||
@@ -1,3 +1,19 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Docker Tools V 1.3.7 - A. GIBERT - 2025/03/31
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Remove ${service_name} == ${APPL_NAME} exption hangling of *_IMG_URL.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
Rx3-Docker/Docker Tools V 1.3.5 - A. GIBERT - 2025/01/24
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
# 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
|
||||||
@@ -17,6 +17,8 @@
|
|||||||
# 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)
|
||||||
|
#
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
set -o errexit
|
set -o errexit
|
||||||
@@ -138,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
|
||||||
|
|
||||||
@@ -272,6 +274,11 @@ function docker_service_add
|
|||||||
user_name="-"
|
user_name="-"
|
||||||
user_id="-"
|
user_id="-"
|
||||||
else
|
else
|
||||||
|
if [[ "${DOCKER_TOOLS_USER_GROUP_FORCE}" == "TRUE" ]]
|
||||||
|
then
|
||||||
|
user_name_id=$( id -u)
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${user_name_id}" =~ ^[0-9]+$ ]]
|
if [[ "${user_name_id}" =~ ^[0-9]+$ ]]
|
||||||
then
|
then
|
||||||
user_name="-"
|
user_name="-"
|
||||||
@@ -291,6 +298,11 @@ function docker_service_add
|
|||||||
group_name="-"
|
group_name="-"
|
||||||
group_id="-"
|
group_id="-"
|
||||||
else
|
else
|
||||||
|
if [[ "${DOCKER_TOOLS_USER_GROUP_FORCE}" == "TRUE" ]]
|
||||||
|
then
|
||||||
|
group_name_id=$( id -g)
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${group_name_id}" =~ ^[0-9]+$ ]]
|
if [[ "${group_name_id}" =~ ^[0-9]+$ ]]
|
||||||
then
|
then
|
||||||
group_name="-"
|
group_name="-"
|
||||||
|
|||||||
Reference in New Issue
Block a user