From d05e63df81d06b1dafa5bcd9a1ff48a52bd6dbc6 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 13 Sep 2026 17:50:18 +0200 Subject: [PATCH] - Add VSL support, - Support now rx3-base 1.2.0. --- ReleaseNotes.txt | 9 ++++ SPECS/docker_tools.spec | 5 ++- lib/rx3/docker_tools.bash | 17 +++++++- sbin/docker_mk_env | 7 ++- sbin/mk_base_image | 89 ++++++++++++++++++++++++--------------- 5 files changed, 88 insertions(+), 39 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e1e2e84..881e673 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/SPECS/docker_tools.spec b/SPECS/docker_tools.spec index 5fdba34..09c12b4 100644 --- a/SPECS/docker_tools.spec +++ b/SPECS/docker_tools.spec @@ -24,7 +24,7 @@ %define name docker_tools -%define version 1.5.2 +%define version 1.5.3 %define release %mkrel 1rx3 %global debug_package %{nil} @@ -184,6 +184,9 @@ cp sbin/* %{buildroot}%{_sbindir} #----------------------------------------------------------------------------------------------------------------------------------- %changelog +* Sun Sep 13 2026 Arnaud G. GIBERT - 1.5.3-1rx3.mga9 +- Update to 1.5.3 + * Sat May 30 2026 Arnaud G. GIBERT - 1.5.2-1rx3.mga9 - Update to 1.5.2 - move lib to top dir diff --git a/lib/rx3/docker_tools.bash b/lib/rx3/docker_tools.bash index ef00549..cf13a3f 100644 --- a/lib/rx3/docker_tools.bash +++ b/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 @@ -46,6 +46,9 @@ fi # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- +declare LIB_NAME="Docker_Tools" +declare LIB_VERSION="1.5.3" + declare -g APPL_HOME_DIR="" @@ -86,3 +89,13 @@ dt_appl_home_get() return 1 fi } + + + + + +#-------------------------------------------------------------------------------------------------------------------------- +# Main +#-------------------------------------------------------------------------------------------------------------------------- + +vsl_add diff --git a/sbin/docker_mk_env b/sbin/docker_mk_env index 364fe35..b65961b 100755 --- a/sbin/docker_mk_env +++ b/sbin/docker_mk_env @@ -57,6 +57,9 @@ # 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="" @@ -147,7 +150,7 @@ module_lib_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 diff --git a/sbin/mk_base_image b/sbin/mk_base_image index 1db5e72..ef89d9a 100755 --- a/sbin/mk_base_image +++ b/sbin/mk_base_image @@ -39,36 +39,37 @@ # Global Variables #----------------------------------------------------------------------------------------------------------------------------------- -declare -g VERSION=1.0.1 -declare -g NAME="MBI" -declare -g HELP="usage: mk_base_image [[-h | --help] | [-V | --version] | [-p | --pre] | [-P | --post] | [-s | --strip] | [-u | --unstrip]] [-D | --direct] [-d | --distrib ] [-l | --lang ] [-L | --language ] [-m | --localtime ] [-r | --root ] [-t | --tmp ] [-T | --test] [-v | --verbose]" +declare -g VERSION=1.5.3 +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 ] [-l | --lang ] [-L | --language ] [-m | --localtime ] [-r | --root ] [-t | --tmp ] [-T | --test] [-v | --verbose]" -declare -g TMP_DIR_DEF="/tmp/mk_base_image" -declare -g ROOT_DIR_DEF="/var/tmp/base_root" +declare -g TMP_DIR_DEF="/tmp/mk_base_image" +declare -g ROOT_DIR_DEF="/var/tmp/base_root" -declare -g DISTRIB_DEF="9" -declare -g LANG_DEF="en_US.UTF-8" -declare -g LANGUAGE_DEF="en_US.UTF-8:en_US:en" -declare -g LOCALTIME_DEF="Europe/Paris" +declare -g DISTRIB_DEF="9" +declare -g LANG_DEF="en_US.UTF-8" +declare -g LANGUAGE_DEF="en_US.UTF-8:en_US:en" +declare -g LOCALTIME_DEF="Europe/Paris" -declare -Ag CONTAINER_TAB +declare -Ag CONTAINER_TAB -declare -g BUILDER_DIR="/" -declare -g ROOT_DIR="${ROOT_DIR_DEF}" -declare -g TMP_DIR="${TMP_DIR_DEF}" +declare -g BUILDER_DIR="/" +declare -g ROOT_DIR="${ROOT_DIR_DEF}" +declare -g TMP_DIR="${TMP_DIR_DEF}" -declare -g DISTRIB="${DISTRIB_DEF}" -declare -g LANG="${LANG_DEF}" -declare -g LANGUAGE="${LANGUAGE_DEF}" -declare -g LOCALTIME="${LOCALTIME_DEF}" +declare -g DISTRIB="${DISTRIB_DEF}" +declare -g LANG="${LANG_DEF}" +declare -g LANGUAGE="${LANGUAGE_DEF}" +declare -g LOCALTIME="${LOCALTIME_DEF}" -declare -g MODE="DEFAULT" -declare -g VERBOSE="FALSE" -declare -g DRY_RUN="FALSE" -declare -g DIRECT="FALSE" +declare -g EXIT_CODE=0 +declare -g MODE="DEFAULT" +declare -g VERBOSE="FALSE" +declare -g DRY_RUN="FALSE" +declare -g DIRECT="FALSE" -declare -g NAME_SERVER_0='10.10.0.254' -declare -g NAME_SERVER_1='8.8.8.8' +declare -g NAME_SERVER_0='10.10.0.254' +declare -g NAME_SERVER_1='8.8.8.8' @@ -95,7 +96,6 @@ function mbi_version_print() function mbi_help_print() { - mbi_version_print help_print } @@ -134,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";; @@ -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}]" @@ -484,6 +501,8 @@ case "${MODE}" in "UNSTRIP") mbi_base_unstrip - ;; - + ;; esac + + +exit ${EXIT_CODE}