- Fix compose indetation.

- New version naming standard,
- Now use docker_tools for .env building,
- Add ceteval bash function,
- Strip down the base:
  - Remove python,
  - Remove dnf,
  - Rmove xz,
  - Remove unused libraries.

Dockerfile

@@ -1,4 +1,4 @@
-# Rx3 Base Mageia-9 Docker Image
+# Rx3-Docker/Base Docker Image
 #-------------------------------------------------------------------------------
 
 FROM mageia:9
@@ -8,29 +8,68 @@ ARG LANGUAGE
 ARG LOCALTIME
 
 
-RUN    echo  -e "LANG=${LANG}\nLANGUAGE=${LANGUAGE}" >/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 \
-    && urpmi.update --no-ignore "Nonfree Release" "Nonfree Updates" "Tainted Release" "Tainted Updates" \
-    && urpmi.update -a \
-    && urpmi --force --replacepkgs glibc locales locales-en \
-    && urpmi --force --auto-update \
-    && rm    -f /var/log/dnf* /var/log/hawkey.log \
-    && echo  -e "export PAGER=less\nexport MANPAGER='less -isr'\nexport EDITOR=emacs\nalias ll='ls -la'\nalias em='emacs'" >/etc/profile.d/rx3.sh
 
+#---------------------------------------------------------------------------------------------------
+ARG LOCALE_CONF="LANG=${LANG}                                                                    \n\
+LANGUAGE=${LANGUAGE}"
+#---------------------------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------------------------
+ARG RX3_SH='export PAGER=less                                                                    \n\
+export MANPAGER="less -isr"                                                                      \n\
+export EDITOR=emacs                                                                              \n\
+                                                                                                 \n\
+function cateval                                                                                 \n\
+{                                                                                                \n\
+    while read line                                                                              \n\
+    do                                                                                           \n\
+        eval $line 2>/dev/null                                                                   \n\
+        eval echo $( echo $line | sed -e `s/"/\\"/g`)                                            \n\
+    done <$1                                                                                     \n\
+}                                                                                                \n\
+                                                                                                 \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 --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                                  \
+    && 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
+
+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_NAME_FULL
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
-LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
+LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
-LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
+LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 

ReadMe.txt

@@ -1,19 +1,24 @@
-Welcome to Rx3/Base-Mga9 docker image!
+Welcome to Rx3-Docker/Base docker image!
 
 
 
-This is project aims to build a Mageia 9 base docker image to be used by others Rx3 packaging projects.
+This project aims to build a Mageia base docker image to be used by other Rx3 packaging projects.
 
 Features:
-    - Curtently based on official Mageia9 docker image from github.io,
+    - Curtently based on official Mageia 9 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),
-
+    - Strip down base (python & dnf removed).
+    
 
 Enjoy it!
 
 Your Rx3 Team.
 
 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3/base-mga9
+https://git.rx3.org/gitea/rx3-docker/base

ReleaseNotes.txt

@@ -1,14 +1,62 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.2.2 - A. GIBERT - 2024/08/25
+Rx3-Docker/Base V 1.3.0 - A. GIBERT - 2024/11/10
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move & Rename repo from Rx3/Base-MGA9 to Rx3-Docker/Base,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Add ceteval bash function,
+- Strip down the base:
+  - Remove python,
+  - Remove dnf,
+  - Rmove xz,
+  - Remove unused libraries.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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
+------------------------------------------------------------------------------------------------------------------------------------
+
+- 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 improvments.
+- Minor compose / dockerfile args improvements.
 
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
+Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Add LANG, LANGUAGE & LOCALTIME build args,
@@ -17,7 +65,7 @@ Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
+Rx3/Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Mono Layer release whith multi-stage building,
@@ -28,7 +76,7 @@ Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
+Rx3/Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
 -----------------------------------------------------------------------------------------------------------------------------------
 
 - Mono Layer release: manually merged by docker export + copy.
@@ -36,7 +84,7 @@ Base-Mga9 V 1.1.0 - A. GIBERT - 2024/08/22
 
 
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
+Rx3/Base-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Initial release,

compose.yaml

@@ -1,24 +1,25 @@
-# Rx3 Base Mageia-9 Docker Image
+# Rx3-Docker/Base Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_ID}
+name:                           ${IMG_NAME}
 
 services:
 
-  default:
+  base:
-    container_name: ${IMG_ID}
+    container_name:             ${IMG_NAME}
+    hostname:                   ${IMG_NAME}
     
-    image: ${IMG_URL}
+    image:                      ${IMG_URL}
     
     build:
-      context: .
+      context:                  .
       args:
-        - IMG_ID=${IMG_ID}
+        IMG_NAME:               ${IMG_NAME}
-        - IMG_NAME=${IMG_NAME}
+        IMG_NAME_FULL:          ${IMG_NAME_FULL}
-        - IMG_VERSION=${IMG_VERSION}
+        IMG_VERSION:            ${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER} 
+        IMG_MAINTAINER:         ${IMG_MAINTAINER} 
-        - LANG=${LANG}
+        LANG:                   ${LANG}
-        - LANGUAGE=${LANGUAGE}
+        LANGUAGE:               ${LANGUAGE}
-        - LOCALTIME=${LOCALTIME}
+        LOCALTIME:              ${LOCALTIME}
        
-    restart: unless-stopped
+    restart:                    unless-stopped

env.dist

@@ -1,13 +1,14 @@
-# Rx3 Base Mageia-9 Docker Image
+# Rx3-Docker/Base Docker Image
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Global Settings
 #-------------------------------------------------------------------------------
 
-IMG_ORG="rx3"
+ORG_NAME="rx3-docker"
-IMG_REGISTRY="docker.xor.rx3:5000"
+ORG_REGISTRY="docker.xor.rx3:5000"
-IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 
 
 
@@ -15,12 +16,13 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_ID="base-mga9"
+IMG_NAME="base"
-IMG_NAME="Rx3 Base Mageia-9 Docker Image"
+IMG_NAME_FULL="Rx3-Docker/Base Docker Image"
-IMG_VERSION="1.2.2"
+IMG_VERSION="1.3.0-mga9"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
+IMG_URL_PREFIX="${ORG_URL_PREFIX}"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 
 
 #-------------------------------------------------------------------------------