From db9a0b4279cea11300baa3d8d36a530d25e0911f Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 8 Mar 2025 11:39:42 +0100 Subject: [PATCH] - Add Rx3 urpmi media source, - Rebuild for updates. --- Dockerfile | 26 ++++++++++++++------------ ReadMe.txt | 5 ++++- ReleaseNotes.txt | 11 ++++++++++- env.dist | 2 +- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9fd5fb..788f646 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,24 +32,26 @@ alias ll="ls -la" alias em="emacs"' #--------------------------------------------------------------------------------------------------- -ARG MIRRORLIST='http://mirror.xor.rx3/mageia/distrib/9/x86_64 http://mirror.rx3.net/mageia/distrib/9/x86_64 ftp://ftp.proxad.net/mirrors/mageia.org/distrib/9/x86_64 http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64' +ARG MIRRORLIST_MGA='http://mirror.xor.rx3/mageia/distrib/9/x86_64 https://mirror.rx3.net/mageia/distrib/9/x86_64 ftp://ftp.proxad.net/mirrors/mageia.org/distrib/9/x86_64 http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64' +ARG MIRRORLIST_RX3='http://mirror.xor.rx3/rx3/distrib/9/x86_64 https://mirror.rx3.net/rx3/distrib/9/x86_64' ARG GIT_MPM_REPO='https://git.rx3.org/gitea/Rx3/mpm/raw/tag/mpm-1.0.0' -RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf \ - && ln -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \ - && urpmi.removemedia -a \ - && rm -f /var/cache/urpmi/mirrors.cache \ - && urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST}" \ - && urpmi.update --no-ignore "Nonfree Release" "Nonfree Updates" "Tainted Release" "Tainted Updates" \ - && urpmi.update -a \ - && urpmi --force --replacepkgs glibc locales locales-en \ - && rpm -e $(rpm -qa | grep -e python -e dnf) gobject-introspection \ +RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf \ + && ln -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \ + && urpmi.removemedia -a \ + && rm -f /var/cache/urpmi/mirrors.cache \ + && urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST_MGA}" \ + && urpmi.addmedia --distrib --mirrorlist "${MIRRORLIST_RX3}" \ + && urpmi.update --no-ignore "Nonfree Release" "Nonfree Updates" "Tainted Release" "Tainted Updates" \ + && urpmi.update -a \ + && urpmi --force --replacepkgs glibc locales locales-en \ + && rpm -e $(rpm -qa | grep -e python -e dnf) gobject-introspection \ && 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 \ + && 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 ADD ${GIT_MPM_REPO}/sbin/mpm /usr/local/sbin diff --git a/ReadMe.txt b/ReadMe.txt index aedc772..02755d8 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -8,9 +8,12 @@ Features: - Curtently based on official Mageia 9 docker image from github.io, - Enable urpmi "Core", "Nonfree" and "Tainted" medium from mirror list: - http://mirror.xor.rx3/, - - http://mirror.rx3.net/, + - https://mirror.rx3.net/, - ftp://ftp.proxad.net/, - http://distrib-coffee.ipsl.jussieu.fr/, + - Enable urpmi "Rx3" media from mirror list: + - http://mirror.xor.rx3/, + - https://mirror.rx3.net/, - Add Rx3 bash seting, - Mono layered (Mageia + Rx3 Updates), - Strip down base (python & dnf removed). diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 8b75440..0042f2e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Base V 1.3.1 - A. GIBERT - 2025/03/08 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add Rx3 urpmi media source, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Base V 1.3.0 - A. GIBERT - 2024/11/10 ------------------------------------------------------------------------------------------------------------------------------------ @@ -9,7 +18,7 @@ Rx3-Docker/Base V 1.3.0 - A. GIBERT - 2024/11/10 - Strip down the base: - Remove python, - Remove dnf, - - Rmove xz, + - Remove xz, - Remove unused libraries. diff --git a/env.dist b/env.dist index 2d1e13a..cf9dfb1 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.0-mga9" +IMG_VERSION="1.3.1-mga9" IMG_MAINTAINER='"Arnaud G. GIBERT" ' IMG_URL_PREFIX="${ORG_URL_PREFIX}"