- Add xz rpm.

- Minor compose / dockerfile args improvments.

.env

@@ -1,9 +1,32 @@
-IMG_ID="base-mga9"
-IMG_NAME="Rx3 Base Mageia-9 Docker Image"
-IMG_VERSION="1.2.1"
+# Rx3 Base Mageia-9 Docker Image
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+# Global Settings
+#-------------------------------------------------------------------------------
+
+IMG_ORG="rx3"
+IMG_REGISTRY="docker.xor.rx3:5000"
+IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
+
+
+
+#-------------------------------------------------------------------------------
+# Image Settings
+#-------------------------------------------------------------------------------
+
+IMG_NAME="base-mga9"
+IMG_FULL_NAME="Rx3 Base Mageia-9 Docker Image"
+IMG_VERSION="1.2.4"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
-# To be configured
+
+
+#-------------------------------------------------------------------------------
+# User Settings
+#-------------------------------------------------------------------------------
+
 LANG=en_US.UTF-8
 LANGUAGE=en_US.UTF-8:en_US:en
 LOCALTIME="Europe/Paris"

Dockerfile

@@ -8,32 +8,50 @@ 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 \
+
+#---------------------------------------------------------------------------------------------------
+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"'
+#---------------------------------------------------------------------------------------------------
+
+
+
+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                  \
     && 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
+    && 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
 
 
 
 FROM scratch
 
-ARG IMG_ID
 ARG IMG_NAME
+ARG IMG_FULL_NAME
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
-LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
-LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
+LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
 
 COPY --from=0 / /
 
-ENTRYPOINT ["sleep", "60m"]
+CMD ["/bin/bash"]
+ENTRYPOINT []

ReadMe.txt

@@ -1,4 +1,4 @@
-Welcome to base-mga9 docker image!
+Welcome to Rx3/Base-Mga9 docker image!
 
 
 

ReleaseNotes.txt

@@ -1,5 +1,30 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
+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.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Add LANG, LANGUAGE & LOCALTIME build args,
@@ -8,7 +33,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,
@@ -19,7 +44,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.
@@ -27,7 +52,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,20 +1,20 @@
 # Rx3 Base Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_ID}
+name: ${IMG_NAME}
 
 services:
 
   default:
-    container_name: ${IMG_ID}
+    container_name: ${IMG_NAME}
     
-    image: docker.xor.rx3:5000/rx3/${IMG_ID}:${IMG_VERSION}
+    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}