From c576a65a93b4d32727895288997e95463bd8207b Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Fri, 4 Oct 2024 14:45:38 +0200 Subject: [PATCH] - Add mpm 1.0.0 (Meta Package Manager), - Fix mirror list in ReadMe.txt. --- .env | 2 +- Dockerfile | 8 ++++++++ ReadMe.txt | 8 ++++++-- ReleaseNotes.txt | 8 ++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.env b/.env index eb6cdb0..3ccf209 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="base-mga9" IMG_FULL_NAME="Rx3 Base Mageia-9 Docker Image" -IMG_VERSION="1.2.5" +IMG_VERSION="1.2.6" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' diff --git a/Dockerfile b/Dockerfile index f0e9c59..7445c8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,8 @@ 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 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 \ @@ -39,6 +41,12 @@ RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf && 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 +ADD ${GIT_MPM_REPO}/etc/mpm.conf /etc +RUN chmod u+x /usr/local/sbin/mpm + +#COPY usr/local/sbin/mpm /usr/local/sbin +#COPY etc/mpm.conf /etc FROM scratch diff --git a/ReadMe.txt b/ReadMe.txt index c0fccbc..e2b6ea8 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -6,9 +6,13 @@ This is project aims to build a Mageia 9 base docker image to be used by others Features: - Curtently based on official Mageia9 docker image from github.io, - - Enable urpmi "Core", "Nonfree" and "Tainted" medium from "http://ftp.free.fr/" mirror, + - Enable urpmi "Core", "Nonfree" and "Tainted" medium from mirror list: + - http://mirror.xor.rx3/, + - http://mirror.rx3.net/, + - ftp://ftp.proxad.net/, + - http://distrib-coffee.ipsl.jussieu.fr/, - Add Rx3 bash seting, - - Mono layered (Mageia + Rx3 Updates) + - Mono layered (Mageia + Rx3 Updates). Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0380c80..d9349f7 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/Base-Mga9 V 1.2.6 - A. GIBERT - 2024/10/04 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add mpm 1.0.0 (Meta Package Manager). + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Base-Mga9 V 1.2.5 - A. GIBERT - 2024/10/02 ------------------------------------------------------------------------------------------------------------------------------------