- Add VSL support,

- Support now rx3-base 1.2.0.

ReleaseNotes.txt

@@ -1,3 +1,25 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.5.3 - A. GIBERT - 2026/09/13
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add VSL support,
+- Support now rx3-base 1.2.0.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/05/30
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move lib to top dir and remove usr,
+- Update mk_base_image to use urpmi-setup-dump.cgi,
+- Fix greedy locales stripping bug in mk_base_image,
+- Fix double / bug in docker_tools_install,
+- Add docker_mk_env default global variables,
+- Now support rx3-base 1.1.2.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/Docker Tools V 1.5.1 - A. GIBERT - 2026/04/10
 ------------------------------------------------------------------------------------------------------------------------------------

SPECS/docker_tools.spec

@@ -24,17 +24,25 @@
 
 
 %define name                            docker_tools
-%define version                         1.5.1
+%define version                         1.5.3
 %define release                         %mkrel 1rx3
 
 %global debug_package                   %{nil}
 
 
 
+
+
+#-----------------------------------------------------------------------------------------------------------------------------------
+# Package
+#-----------------------------------------------------------------------------------------------------------------------------------
+
 Name:                                   %{name}
 Version:                                %{version}
 Release:                                %{release}
+
 Summary:                                Rx3 Docker Management Tools
+
 License:                                GPL
 URL:                                    https://git.rx3.org/gitea/rx3/%{name}
 
@@ -46,7 +54,7 @@ Packager:                               Arnaud G. GIBERT <arnaud@rx3.net>
 
 BuildArch:                              noarch
 
-Requires:                               rx3-base
+Requires:                               rx3-base-libs
 
 %description
 This project aims to give some basic tools to be used by other Rx3 docker packaging projects
@@ -70,8 +78,10 @@ Support different mounted volume modes:
 
 
 %package                                devel
-Summary:                                Meta Package Manager - Server repository
+Summary:                                Rx3 Docker Developement Tools
+
 Requires:                               %{name}
+Requires:                               rx3-base-tools
 Requires:                               buildah
 
 %description                            devel
@@ -116,7 +126,7 @@ cp etc/bash_completion.d/*              %{buildroot}%{_sysconfdir}/bash_completi
 
 # Lib
 %{__mkdir_p}                            %{buildroot}%{_prefix}/lib/rx3
-cp usr/lib/rx3/*.bash                   %{buildroot}%{_prefix}/lib/rx3
+cp lib/rx3/*.bash                       %{buildroot}%{_prefix}/lib/rx3
 
 # Bin
 %{__mkdir_p}                            %{buildroot}%{_sbindir}
@@ -174,6 +184,13 @@ cp sbin/*                               %{buildroot}%{_sbindir}
 #-----------------------------------------------------------------------------------------------------------------------------------
 
 %changelog
+* Sun Sep 13 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.3-1rx3.mga9
+- Update to 1.5.3
+
+* Sat May 30 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
+- Update to 1.5.2
+- move lib to top dir
+
 * Fri Apr 10 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.1-1rx3.mga9
 - Update to 1.5.1
 

lib/rx3/docker_tools.bash

@@ -22,11 +22,11 @@
 # 
 #-----------------------------------------------------------------------------------------------------------------------------------
 
-if [[ "${RX3_DOCKER_TOOLS}" != "" ]]
+if [[ "${DOCKER_TOOLS}" != "" ]]
 then
     return
 else
-    declare -g RX3_DOCKER_TOOLS=1
+    declare -g DOCKER_TOOLS=1
 fi
 
 
@@ -42,6 +42,19 @@ fi
 
 
 
+#-----------------------------------------------------------------------------------------------------------------------------------
+# Global Variables
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+declare              LIB_NAME="Docker_Tools"
+declare           LIB_VERSION="1.5.3"
+
+declare -g APPL_HOME_DIR=""
+
+
+
+
+
 #-----------------------------------------------------------------------------------------------------------------------------------
 # Appl Home Get
 #-----------------------------------------------------------------------------------------------------------------------------------
@@ -76,3 +89,13 @@ dt_appl_home_get()
         return 1
     fi
 }
+
+
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# Main
+#--------------------------------------------------------------------------------------------------------------------------
+
+vsl_add

sbin/docker_build_push

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_logs

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_mk_dir

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_mk_env

@@ -42,7 +42,8 @@
 
 
 
-# Include
+#-----------------------------------------------------------------------------------------------------------------------------------
+# Includes
 #-----------------------------------------------------------------------------------------------------------------------------------
 
 : "${RX3_LIB_DIR:=/usr/lib/rx3}"
@@ -52,6 +53,23 @@
 
 
 
+#-----------------------------------------------------------------------------------------------------------------------------------
+# Global Variables
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+declare -g    VERSION="1.5.3"
+declare -g       NAME="Docker_Mk_Env"
+
+declare -g           DOCKER_TOOLS_VOLUME="SINGLE"
+declare -g    DOCKER_TOOLS_EXEPTION_LIBS=""
+declare -g    DOCKER_TOOLS_EXEPTION_LOGS=""
+declare -g DOCKER_TOOLS_USER_GROUP_FORCE="FALSE"
+
+
+
+
+
+#-----------------------------------------------------------------------------------------------------------------------------------
 # Init
 #-----------------------------------------------------------------------------------------------------------------------------------
 
@@ -72,7 +90,10 @@ CONFIG_FILE_LIST=""
 
 
 #-----------------------------------------------------------------------------------------------------------------------------------
-function dynvar_export
+# Dynvar Export
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+dynvar_export()
 {
        var=$1
      value=$2
@@ -86,7 +107,10 @@ function dynvar_export
 
 
 #-----------------------------------------------------------------------------------------------------------------------------------
-function psfix_cat
+# Psfix Cat
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+psfix_cat()
 {
        prefix=$1
     separator=$2
@@ -104,7 +128,10 @@ function psfix_cat
 
 
 #-----------------------------------------------------------------------------------------------------------------------------------
-function module_lib_name_get
+# Module Lib Name Get
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+module_lib_name_get()
 {
        module=$1
 
@@ -123,7 +150,10 @@ function module_lib_name_get
 
 
 #-----------------------------------------------------------------------------------------------------------------------------------
-function module_log_name_get
+# Module Log Name Get
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+module_log_name_get()
 {
        module=$1
 
@@ -142,7 +172,10 @@ function module_log_name_get
 
 
 #-----------------------------------------------------------------------------------------------------------------------------------
-function docker_service_add
+# Docker Service Add
+#-----------------------------------------------------------------------------------------------------------------------------------
+
+docker_service_add()
 {
     varible_prefix="$1"
     shift
@@ -355,7 +388,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 +403,7 @@ function docker_config_add
 
 
 
+#-----------------------------------------------------------------------------------------------------------------------------------
 # Main
 #-----------------------------------------------------------------------------------------------------------------------------------
 
@@ -380,6 +417,8 @@ function docker_config_add
 
 #-----------------------------------------------------------------------------------------------------------------------------------
 
+vsl_add
+
 . ${APPL_HOME_DIR}/env
 
 

sbin/docker_network_down

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_network_up

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_restart

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_sbs

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_start

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_stop

@@ -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
 #-----------------------------------------------------------------------------------------------------------------------------------
 

sbin/docker_tools_install

@@ -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 .
 

sbin/mk_base_image

@@ -39,8 +39,8 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------
 
-declare -g              VERSION=1.0.1
+declare -g        VERSION=1.5.3
-declare -g                 NAME="MBI"
+declare -g           NAME="Mk_Base_Image"
 declare -g           HELP="usage: mk_base_image [[-h | --help] | [-V | --version] | [-p | --pre] | [-P | --post] | [-s | --strip] | [-u | --unstrip]] [-D | --direct] [-d | --distrib <Distrib>] [-l | --lang <Lang>] [-L | --language <Langage>] [-m | --localtime <Local_Time>] [-r | --root <Root_Dir>] [-t | --tmp <Tmp_Dir>] [-T | --test] [-v | --verbose]"
 
 declare -g    TMP_DIR_DEF="/tmp/mk_base_image"
@@ -62,6 +62,7 @@ declare -g                 LANG="${LANG_DEF}"
 declare -g       LANGUAGE="${LANGUAGE_DEF}"
 declare -g      LOCALTIME="${LOCALTIME_DEF}"
  
+declare -g      EXIT_CODE=0
 declare -g           MODE="DEFAULT"
 declare -g        VERBOSE="FALSE"
 declare -g        DRY_RUN="FALSE"
@@ -95,7 +96,6 @@ function mbi_version_print()
 
 function mbi_help_print()
 {
-    mbi_version_print
     help_print
 }
 
@@ -116,7 +116,8 @@ function mbi_args_parse()
     # Note the quotes around `$tmp_args': they are essential!
     eval set -- "${tmp_args}"
 
-    while true ; do
+    while true
+    do
 	case "$1" in
             
 	    # Options
@@ -133,12 +134,12 @@ function mbi_args_parse()
             -r|--root)                       shift;        ROOT_DIR="$1";                         shift;;
             
 	    # Mode switches
-	    -h|--help)                                         MODE="EXIT";    mbi_help_print;    shift;;
+	    -h|--help)                                         MODE="HELP";                       shift;;
             -p|--pre)                                          MODE="PRE";                        shift;;
             -P|--post)                                         MODE="POST";                       shift;;
             -s|--strip)                                        MODE="STRIP";                      shift;;
             -u|--unstrip)                                      MODE="UNSTRIP";                    shift;;
-	    -V|--version)                                      MODE="EXIT";    mbi_version_print; shift;;
+	    -V|--version)                                      MODE="VERSION";                    shift;;
 
 	    # Global options
             -T|--test)                                      DRY_RUN="TRUE";                       shift;  RECALL_OPTS+=" --test";;
@@ -246,7 +247,7 @@ function mbi_env_init()
             echo_error "Making Builder..."
 
             cmd_exec                         cp /etc/resolv.conf "${BUILDER_DIR}/etc/resolv.conf"
-            cmd_exec chroot "${BUILDER_DIR}" bash -c 'curl -L http://mirror.rx3.net/rx3/sbin/urpmi-setup-'${DISTRIB}' | bash'
+            cmd_exec chroot "${BUILDER_DIR}" bash -c 'curl -L http://mirror.rx3.net/rx3/cgi-bin/urpmi-setup-dump.cgi?'${DISTRIB}' | bash'
             cmd_exec chroot "${BUILDER_DIR}" urpmi --force rx3-base
         fi
     fi
@@ -350,7 +351,6 @@ function mbi_base_install_post()
 {
     
     cmd_exec chroot ${ROOT_DIR} urpmi-setup --verbose --distrib "${DISTRIB}"
-#    cmd_exec chroot ${ROOT_DIR} bash -c 'curl -L http://mirror.rx3.net/rx3/sbin/urpmi-setup-'${DISTRIB}' | bash'
     
     cmd_exec chroot ${ROOT_DIR} urpmi --force --auto-update
     
@@ -371,15 +371,15 @@ function mbi_base_install_post()
 function mbi_base_strip()
 {
     # RPM force uninstall
-    cmd_exec chroot ${ROOT_DIR} rpm -e --nodeps cracklib-dicts
+    cmd_exec chroot ${ROOT_DIR} rpm -e --nodeps cracklib-dicts                                                                        || true
-    cmd_exec chroot ${ROOT_DIR} rpm -e          dhcp-common dhcp-client cronie-anacron
+    cmd_exec chroot ${ROOT_DIR} rpm -e          dhcp-common dhcp-client cronie-anacron                                                || true
 
     # Docker mounts tmpfs at /dev and procfs at /proc so we can remove them
-    cmd_exec                    rm    -rf "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc                                            2>/dev/null
+    cmd_exec                    rm    -rf "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc                                            2>/dev/null || true
-    cmd_exec                    mkdir -p  "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc                                            2>/dev/null
+    cmd_exec                    mkdir -p  "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc                                            2>/dev/null || true
 
     # Keep only en_US.UTF8 locale
-    cmd_exec                    rm -rf "${ROOT_DIR}"/usr/share/locale/!("en_US.UTF-8"|"locale.alias"|"locale-archive")
+    cmd_exec                    rm -rf "${ROOT_DIR}"/usr/share/locale/!("UTF-8"|"C.UTF-8"|"en_US.UTF-8"|"en"|"locale.alias"|"locale-archive")
     
     cmd_exec                    rm -rf "${ROOT_DIR}"/usr/{{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
 
@@ -431,6 +431,8 @@ function mbi_base_unstrip()
 # Main
 #-----------------------------------------------------------------------------------------------------------------------------------
 
+vsl_add
+
 ORIG_ARGS=("$@")
 
  
@@ -441,15 +443,30 @@ export LC_ALL="C"
 
 mbi_args_parse "$@"
 
+
+case "${MODE}" in        
+    "EXIT")
+        exit ${EXIT_CODE}
+    ;;
+    
+    "HELP")
+        mbi_help_print
+        exit ${EXIT_CODE}
+    ;;
+
+    "TEST")
+	DRY_RUN="TRUE"
+    ;;
+    
+    "VERSION")
+        mbi_version_print
+        exit ${EXIT_CODE}
+    ;;
+esac
+
+
 mbi_container_tab_init
 
-
-if [[ ${MODE} == "EXIT" ]]
-then
-    exit 0
-fi
-
-
 echo_error "MBI: Mode: [${MODE}]   Verbose: [${VERBOSE}]   Distrib: [${DISTRIB}]   Direct: [${DIRECT}]   Dry_Run: [${DRY_RUN}]   Lang: [${LANG}]   Language: [${LANGUAGE}]   Local_Time: [${LOCALTIME}]   Builder_Dir: [${BUILDER_DIR}]   Root_Dir: [${ROOT_DIR}]   Tmp_Dir: [${TMP_DIR}]"
 
 
@@ -485,5 +502,7 @@ case "${MODE}" in
     "UNSTRIP")
         mbi_base_unstrip
     ;;   
-    
 esac
+
+
+exit ${EXIT_CODE}