.env

@@ -15,10 +15,10 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_NAME="base-mga9"
+IMG_ID="base-mga9"
-IMG_FULL_NAME="Rx3 Base Mageia-9 Docker Image"
+IMG_NAME="Rx3 Base Mageia-9 Docker Image"
-IMG_VERSION="1.2.6"
+IMG_VERSION="1.2.2"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 

Dockerfile

@@ -8,57 +8,29 @@ ARG LANGUAGE
 ARG LOCALTIME
 
 
-
+RUN    echo  -e "LANG=${LANG}\nLANGUAGE=${LANGUAGE}" >/etc/locale.conf \
-#---------------------------------------------------------------------------------------------------
-ARG LOCALE_CONF="LANG=${LANG}                                                                    \n\
-LANGUAGE=${LANGUAGE}"
-#---------------------------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------------------------------
-ARG RX3_SH='export PAGER=less                                                                    \n\
-export MANPAGER="less -isr"                                                                      \n\
-export EDITOR=emacs                                                                              \n\
-alias ll="ls -la"                                                                                \n\
-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                                  \
     && ln    -s /usr/share/zoneinfo/${LOCALTIME} /etc/localtime \
     && urpmi.removemedia -a \
-    && rm -f /var/cache/urpmi/mirrors.cache                                                             \
+    && urpmi.addmedia --distrib http://ftp.free.fr/mirrors/mageia.org/distrib/9/x86_64 \
-    && 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 \
-    && urpmi --force xz                                                                                 \
     && 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 "export PAGER=less\nexport MANPAGER='less -isr'\nexport EDITOR=emacs\nalias ll='ls -la'\nalias em='emacs'" >/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
 
+ARG IMG_ID
 ARG IMG_NAME
-ARG IMG_FULL_NAME
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
-LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
+LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
-LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
+LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 

ReadMe.txt

@@ -6,13 +6,9 @@ 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 mirror list:
+    - Enable urpmi "Core", "Nonfree" and "Tainted" medium from "http://ftp.free.fr/" mirror,
-        - 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!

ReleaseNotes.txt

@@ -1,46 +1,14 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.2.6 - A. GIBERT - 2024/10/04
+Base-Mga9 V 1.2.2 - A. GIBERT - 2024/08/25
-------------------------------------------------------------------------------------------------------------------------------------
-
-- Add mpm 1.0.0 (Meta Package Manager).
-
-
-
-------------------------------------------------------------------------------------------------------------------------------------
-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
-------------------------------------------------------------------------------------------------------------------------------------
-
-- Add xz rpm.
-
-
-
-------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.2.3 - A. GIBERT - 2024/08/27
-------------------------------------------------------------------------------------------------------------------------------------
-
-- Minor compose / dockerfile args & structure improvements.
-
-
-
-------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.2.2 - A. GIBERT - 2024/08/25
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Remove entrypoint now implemented by rx3/server-mga9 image,
-- Minor compose / dockerfile args improvements.
+- Minor compose / dockerfile args improvments.
 
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
+Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Add LANG, LANGUAGE & LOCALTIME build args,
@@ -49,7 +17,7 @@ Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
+Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Mono Layer release whith multi-stage building,
@@ -60,7 +28,7 @@ Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
+Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
 -----------------------------------------------------------------------------------------------------------------------------------
 
 - Mono Layer release: manually merged by docker export + copy.
@@ -68,7 +36,7 @@ Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3/Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
+Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,

compose.yaml

@@ -1,20 +1,20 @@
 # Rx3 Base Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_NAME}
+name: ${IMG_ID}
 
 services:
 
   default:
-    container_name: ${IMG_NAME}
+    container_name: ${IMG_ID}
     
     image: ${IMG_URL}
     
     build:
       context: .
       args:
+        - IMG_ID=${IMG_ID}
         - IMG_NAME=${IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
         - IMG_VERSION=${IMG_VERSION}
         - IMG_MAINTAINER=${IMG_MAINTAINER} 
         - LANG=${LANG}