- Add VSL support,

- Support now rx3-base 1.2.0.
This commit is contained in:
2026-09-13 17:50:18 +02:00
parent 89ec509f92
commit d05e63df81
5 changed files with 88 additions and 39 deletions

View File

@@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
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 Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/05/30
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

View File

@@ -24,7 +24,7 @@
%define name docker_tools %define name docker_tools
%define version 1.5.2 %define version 1.5.3
%define release %mkrel 1rx3 %define release %mkrel 1rx3
%global debug_package %{nil} %global debug_package %{nil}
@@ -184,6 +184,9 @@ cp sbin/* %{buildroot}%{_sbindir}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %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 * Sat May 30 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
- Update to 1.5.2 - Update to 1.5.2
- move lib to top dir - move lib to top dir

View File

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

View File

@@ -57,6 +57,9 @@
# Global Variables # Global Variables
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
declare -g VERSION="1.5.3"
declare -g NAME="Docker_Mk_Env"
declare -g DOCKER_TOOLS_VOLUME="SINGLE" declare -g DOCKER_TOOLS_VOLUME="SINGLE"
declare -g DOCKER_TOOLS_EXEPTION_LIBS="" declare -g DOCKER_TOOLS_EXEPTION_LIBS=""
declare -g DOCKER_TOOLS_EXEPTION_LOGS="" declare -g DOCKER_TOOLS_EXEPTION_LOGS=""
@@ -147,7 +150,7 @@ module_lib_name_get()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
# ModulE Log Name Get # Module Log Name Get
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
module_log_name_get() module_log_name_get()
@@ -414,6 +417,8 @@ docker_config_add()
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
. ${APPL_HOME_DIR}/env . ${APPL_HOME_DIR}/env

View File

@@ -39,36 +39,37 @@
# Global Variables # 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 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" declare -g TMP_DIR_DEF="/tmp/mk_base_image"
declare -g ROOT_DIR_DEF="/var/tmp/base_root" declare -g ROOT_DIR_DEF="/var/tmp/base_root"
declare -g DISTRIB_DEF="9" declare -g DISTRIB_DEF="9"
declare -g LANG_DEF="en_US.UTF-8" declare -g LANG_DEF="en_US.UTF-8"
declare -g LANGUAGE_DEF="en_US.UTF-8:en_US:en" declare -g LANGUAGE_DEF="en_US.UTF-8:en_US:en"
declare -g LOCALTIME_DEF="Europe/Paris" declare -g LOCALTIME_DEF="Europe/Paris"
declare -Ag CONTAINER_TAB declare -Ag CONTAINER_TAB
declare -g BUILDER_DIR="/" declare -g BUILDER_DIR="/"
declare -g ROOT_DIR="${ROOT_DIR_DEF}" declare -g ROOT_DIR="${ROOT_DIR_DEF}"
declare -g TMP_DIR="${TMP_DIR_DEF}" declare -g TMP_DIR="${TMP_DIR_DEF}"
declare -g DISTRIB="${DISTRIB_DEF}" declare -g DISTRIB="${DISTRIB_DEF}"
declare -g LANG="${LANG_DEF}" declare -g LANG="${LANG_DEF}"
declare -g LANGUAGE="${LANGUAGE_DEF}" declare -g LANGUAGE="${LANGUAGE_DEF}"
declare -g LOCALTIME="${LOCALTIME_DEF}" declare -g LOCALTIME="${LOCALTIME_DEF}"
declare -g MODE="DEFAULT" declare -g EXIT_CODE=0
declare -g VERBOSE="FALSE" declare -g MODE="DEFAULT"
declare -g DRY_RUN="FALSE" declare -g VERBOSE="FALSE"
declare -g DIRECT="FALSE" declare -g DRY_RUN="FALSE"
declare -g DIRECT="FALSE"
declare -g NAME_SERVER_0='10.10.0.254' declare -g NAME_SERVER_0='10.10.0.254'
declare -g NAME_SERVER_1='8.8.8.8' declare -g NAME_SERVER_1='8.8.8.8'
@@ -95,7 +96,6 @@ function mbi_version_print()
function mbi_help_print() function mbi_help_print()
{ {
mbi_version_print
help_print help_print
} }
@@ -134,12 +134,12 @@ function mbi_args_parse()
-r|--root) shift; ROOT_DIR="$1"; shift;; -r|--root) shift; ROOT_DIR="$1"; shift;;
# Mode switches # Mode switches
-h|--help) MODE="EXIT"; mbi_help_print; shift;; -h|--help) MODE="HELP"; shift;;
-p|--pre) MODE="PRE"; shift;; -p|--pre) MODE="PRE"; shift;;
-P|--post) MODE="POST"; shift;; -P|--post) MODE="POST"; shift;;
-s|--strip) MODE="STRIP"; shift;; -s|--strip) MODE="STRIP"; shift;;
-u|--unstrip) MODE="UNSTRIP"; shift;; -u|--unstrip) MODE="UNSTRIP"; shift;;
-V|--version) MODE="EXIT"; mbi_version_print; shift;; -V|--version) MODE="VERSION"; shift;;
# Global options # Global options
-T|--test) DRY_RUN="TRUE"; shift; RECALL_OPTS+=" --test";; -T|--test) DRY_RUN="TRUE"; shift; RECALL_OPTS+=" --test";;
@@ -431,6 +431,8 @@ function mbi_base_unstrip()
# Main # Main
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
vsl_add
ORIG_ARGS=("$@") ORIG_ARGS=("$@")
@@ -441,15 +443,30 @@ export LC_ALL="C"
mbi_args_parse "$@" 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 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}]" 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") "UNSTRIP")
mbi_base_unstrip mbi_base_unstrip
;; ;;
esac esac
exit ${EXIT_CODE}