diff --git a/Dockerfile b/Dockerfile index a837a75..087be49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM mageia:9 +ARG IMG_URL ARG LANG ARG LANGUAGE ARG LOCALTIME @@ -52,6 +53,76 @@ file_enable() \n\ export -f file_enable \n\ \n\ +export ISL_FILE=/etc/img_stack_log \n\ + \n\ +isl_add() \n\ +{ \n\ + url="$1" \n\ + \n\ + \n\ + reg=${url%%/*} \n\ + \n\ + if [[ "${reg}" == *.* ]] \n\ + then \n\ + url=${url#*/} \n\ + else \n\ + reg="-" \n\ + fi \n\ + \n\ + tag=${url/*:} \n\ + name=${url%:*} \n\ + \n\ + ts=$(date -u +"%Y/%d/%m %H:%M:%S") \n\ + \n\ + echo "${ts} ${reg} ${name} ${tag}" >> ${ISL_FILE} \n\ +} \n\ + \n\ +export -f isl_add \n\ + \n\ +isl_cat() \n\ +{ \n\ + cat ${ISL_FILE} \n\ +} \n\ + \n\ +export -f isl_cat \n\ + \n\ +isl_tail() \n\ +{ \n\ + tail -1 ${ISL_FILE} \n\ +} \n\ + \n\ +export -f isl_tail \n\ + \n\ +isl_last() \n\ +{ \n\ + set $(isl_tail) \n\ + \n\ + echo "$4:$5" \n\ +} \n\ + \n\ +export -f isl_last \n\ + \n\ +isl_html_dump() \n\ +{ \n\ + while read line \n\ + do \n\ + set $line \n\ + \n\ + echo -n " \\n" \n\ + \n\ + i=1 \n\ + while [[ $i -lt 6 ]] \n\ + do \n\ + echo -n " ${!i}\\n" \n\ + i=$(( $i + 1)) \n\ + done \n\ + \n\ + echo -n " \\n" \n\ + done < ${ISL_FILE} \n\ +} \n\ + \n\ +export -f isl_html_dump \n\ + \n\ alias ll="ls -la" \n\ alias em="emacs"' #--------------------------------------------------------------------------------------------------- @@ -76,7 +147,8 @@ RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf && rpm -e lib64comps0 lib64gio2.0_0 lib64girepository1.0_1 lib64glib-gir2.0 lib64gpgme11 lib64modulemd2 lib64modulemd-gir2.0 lib64mpdec3 lib64nsl2 lib64repo0 lib64rpmsign9 lib64solv1 lib64yaml0_2 lib64zck1 \ && urpmi --force --auto-update \ && rm -f /var/log/dnf* /var/log/hawkey.log \ - && echo -e "${RX3_SH}" | sed -e "s/\`/'/g" -e 's/ *$//' >/etc/profile.d/rx3.sh + && echo -e "${RX3_SH}" | sed -e "s/\`/'/g" -e 's/ *$//' >/etc/profile.d/rx3.sh \ + && . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} ADD ${GIT_MPM_REPO}/sbin/mpm /usr/local/sbin ADD ${GIT_MPM_REPO}/etc/mpm.conf /etc diff --git a/ReadMe.txt b/ReadMe.txt index 6024476..cbccf72 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -16,7 +16,8 @@ Features: - https://mirror.rx3.net/, - Add Rx3 bash seting, - Mono layered (Mageia + Rx3 Updates), - - Strip down base (python & dnf removed). + - Strip down base (python & dnf removed), + - Image stacking log support. Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index b50fa18..c15e1d5 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Base V 1.4.0 - A. GIBERT - 2026/02/13 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add Image Stacking Log functions, +- Add ISL support, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Base V 1.3.6 - A. GIBERT - 2025/11/28 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 7b8f0a7..2787bfe 100644 --- a/compose.yaml +++ b/compose.yaml @@ -17,7 +17,8 @@ services: IMG_NAME: ${IMG_NAME} IMG_NAME_FULL: ${IMG_NAME_FULL} IMG_VERSION: ${IMG_VERSION} - IMG_MAINTAINER: ${IMG_MAINTAINER} + IMG_URL: ${IMG_URL} + IMG_MAINTAINER: ${IMG_MAINTAINER} LANG: ${LANG} LANGUAGE: ${LANGUAGE} LOCALTIME: ${LOCALTIME} diff --git a/env.dist b/env.dist index d64b9e1..5b7d9f3 100644 --- a/env.dist +++ b/env.dist @@ -18,7 +18,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" IMG_NAME="base" IMG_NAME_FULL="Rx3-Docker/Base Docker Image" -IMG_VERSION="1.3.6-mga9" +IMG_VERSION="1.4.0-mga9" IMG_MAINTAINER='"Arnaud G. GIBERT" ' IMG_URL_PREFIX="${ORG_URL_PREFIX}"