From e9bafeed3f3cea20fba38c16256d1854511e0624 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Wed, 2 Oct 2024 14:14:54 +0200 Subject: [PATCH] - Add mirror list to urpmi and use Rx3 internal & external mirrors first. --- .env | 2 +- Dockerfile | 5 ++++- ReleaseNotes.txt | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.env b/.env index be4bdf7..eb6cdb0 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.4" +IMG_VERSION="1.2.5" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' diff --git a/Dockerfile b/Dockerfile index d5c85a2..f0e9c59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,12 +22,15 @@ 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' + RUN echo -e "${LOCALE_CONF}" | sed -e 's/ *$//' > /etc/locale.conf \ && ln -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \ && urpmi.removemedia -a \ - && urpmi.addmedia --distrib http://ftp.free.fr/mirrors/mageia.org/distrib/9/x86_64 \ + && 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 \ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index a921262..0380c80 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/Base-Mga9 V 1.2.5 - A. GIBERT - 2024/10/02 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add mirror list to urpmi and use Rx3 internal & external mirrors first. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/Base-Mga9 V 1.2.4 - A. GIBERT - 2024/08/28 ------------------------------------------------------------------------------------------------------------------------------------