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

- Fix double / bug in docker_tools_install,

Browse Source 
- Add APPL_HOME_DIR declaration in docker_tools lib,
- Minor comment fixes.
This commit is contained in:
Arnaud G. GIBERT
2026-05-27 19:16:01 +02:00
parent b0c891ea53
commit 038f77f2fe
14 changed files with 97 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReleaseNotes.txt
View File

@@ -1,9 +1,10 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/05/04
Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/05/27
------------------------------------------------------------------------------------------------------------------------------------
- Move lib to top dir and remove usr,
- Update mk_base_image to use urpmi-setup-dump.cgi,
- Fix double / bug in docker_tools_install,
- Now support rx3-base 1.1.2.

2
SPECS/docker_tools.spec
View File

@@ -184,7 +184,7 @@ cp sbin/* %{buildroot}%{_sbindir}
#-----------------------------------------------------------------------------------------------------------------------------------
%changelog
* Mon May 4 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
* Wed May 27 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
- Update to 1.5.2
- move lib to top dir

10
lib/rx3/docker_tools.bash
View File

@@ -42,6 +42,16 @@ fi
#-----------------------------------------------------------------------------------------------------------------------------------
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g APPL_HOME_DIR=""
#-----------------------------------------------------------------------------------------------------------------------------------
# Appl Home Get
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_build_push
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_logs
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_mk_dir
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

35
sbin/docker_mk_env
View File

@@ -42,7 +42,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -52,6 +53,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -72,7 +74,10 @@ CONFIG_FILE_LIST=""
#-----------------------------------------------------------------------------------------------------------------------------------
function dynvar_export
# Dynvar Export
#-----------------------------------------------------------------------------------------------------------------------------------
dynvar_export()
{
var=$1
value=$2
@@ -86,7 +91,10 @@ function dynvar_export
#-----------------------------------------------------------------------------------------------------------------------------------
function psfix_cat
# Psfix Cat
#-----------------------------------------------------------------------------------------------------------------------------------
psfix_cat()
{
prefix=$1
separator=$2
@@ -104,7 +112,10 @@ function psfix_cat
#-----------------------------------------------------------------------------------------------------------------------------------
function module_lib_name_get
# Module Lib Name Get
#-----------------------------------------------------------------------------------------------------------------------------------
module_lib_name_get()
{
module=$1
@@ -123,7 +134,10 @@ function module_lib_name_get
#-----------------------------------------------------------------------------------------------------------------------------------
function module_log_name_get
# ModulE Log Name Get
#-----------------------------------------------------------------------------------------------------------------------------------
module_log_name_get()
{
module=$1
@@ -142,7 +156,10 @@ function module_log_name_get
#-----------------------------------------------------------------------------------------------------------------------------------
function docker_service_add
# Docker Service Add
#-----------------------------------------------------------------------------------------------------------------------------------
docker_service_add()
{
varible_prefix="$1"
shift
@@ -355,7 +372,10 @@ function docker_service_add
#-----------------------------------------------------------------------------------------------------------------------------------
function docker_config_add
# Docker Config Add
#-----------------------------------------------------------------------------------------------------------------------------------
docker_config_add()
{
config_file_target="$1"
config_file_source="$2"
@@ -367,6 +387,7 @@ function docker_config_add
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_network_down
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -47,6 +49,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_network_up
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_restart
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_sbs
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_start
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

5
sbin/docker_stop
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,7 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -48,6 +50,7 @@ dt_appl_home_get "${1:-}"
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-----------------------------------------------------------------------------------------------------------------------------------

32
sbin/docker_tools_install
View File

@@ -24,7 +24,8 @@
# Include
#-----------------------------------------------------------------------------------------------------------------------------------
# Includes
#-----------------------------------------------------------------------------------------------------------------------------------
: "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -34,6 +35,17 @@
#-----------------------------------------------------------------------------------------------------------------------------------
# Global Variables
#-----------------------------------------------------------------------------------------------------------------------------------
declare -g DOCKER_TOOLS_HOME_DIR="$(dirname "$(dirname "$0")")"
#-----------------------------------------------------------------------------------------------------------------------------------
# Init
#-----------------------------------------------------------------------------------------------------------------------------------
@@ -44,21 +56,11 @@ fi
dt_appl_home_get "${1:-}"
DOCKER_TOOLS_HOME_DIR="$(dirname "$(dirname "$0")")"
if [[ "${1:-}" == "" ]]
then
APPL_HOME_DIR="$PWD"
else
APPL_HOME_DIR="${1}"
fi
#-----------------------------------------------------------------------------------------------------------------------------------
# Link Create
#-------------------------------------------------------------------------------
@@ -86,6 +88,7 @@ function link_create
#-----------------------------------------------------------------------------------------------------------------------------------
# Main
#-------------------------------------------------------------------------------
@@ -95,6 +98,11 @@ cd ${APPL_HOME_DIR}
docker_tools_home_dir=$( realpath ${DOCKER_TOOLS_HOME_DIR})
if [[ "${docker_tools_home_dir}" == "/" ]]
then
docker_tools_home_dir=""
fi
#link_create ${docker_tools_home_dir}/sbin .