From 9c5eb6a4fa7d072f77011e164a47e75145bbdede Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Sat, 24 Aug 2024 22:58:35 +0200
Subject: [PATCH] - Add LANG, LANGUAGE & LOCALTIME build args, - Set by default
 laguage to en_US.UTF-8 & timezone to Europe/Paris.

---
 .env             |  7 ++++++-
 Dockerfile       | 18 ++++++++++++------
 ReadMe.txt       |  2 +-
 ReleaseNotes.txt |  9 +++++++++
 compose.yaml     | 10 +++++++++-
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index bcca66d..c53d212 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,9 @@
 IMG_ID="base-mga9"
 IMG_NAME="Rx3 Base Mageia-9 Docker Image"
-IMG_VERSION="1.2.0"
+IMG_VERSION="1.2.1"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
+
+# To be configured
+LANG=en_US.UTF-8
+LANGUAGE=en_US.UTF-8:en_US:en
+LOCALTIME="Europe/Paris"
diff --git a/Dockerfile b/Dockerfile
index 744d528..6eeb366 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,21 @@
 
 FROM mageia:9
 
-RUN    urpmi.removemedia -a \
+ARG LANG
+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 --auto-update \
     && urpmi --force --replacepkgs glibc locales locales-en \
-    && rm -f /var/log/dnf* /var/log/hawkey.log \
-    && echo -e "LANG=en_US.UTF-8\nLANGUAGE=en_US.UTF-8:en_US:en" >/etc/locale.conf \
-    && 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 --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
 
 
 
@@ -27,7 +33,7 @@ LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
 LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
+
 COPY --from=0 / /
 
 ENTRYPOINT ["sleep", "60m"]
-
diff --git a/ReadMe.txt b/ReadMe.txt
index 5436a0e..816fb86 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -2,7 +2,7 @@ Welcome to base-mga9 docker image!
 
 
 
-This is project aim to build a Mageia 9 base docker image used by others Rx3 packaging projects.
+This is project aims to build a Mageia 9 base docker image to be used by others Rx3 packaging projects.
 
 Features:
     - Curtently based on official Mageia9 docker image from github.io,
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index b2f87a5..7235aaf 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,12 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add LANG, LANGUAGE & LOCALTIME build args,
+- Set by default laguage to en_US.UTF-8 & timezone to Europe/Paris.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Base-Mga9 V 1.2.0 - A. GIBERT - 2024/08/22
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/compose.yaml b/compose.yaml
index abe0a57..55f2c9d 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,15 +2,23 @@
 #-------------------------------------------------------------------------------
 
 name: ${IMG_ID}
+
 services:
+
   default:
     container_name: ${IMG_ID}
+    
     image: docker.xor.rx3:5000/rx3/${IMG_ID}:${IMG_VERSION}
+    
     build:
       context: .
       args:
         - IMG_ID=${IMG_ID}
         - IMG_NAME=${IMG_NAME}
         - IMG_VERSION=${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
+        - IMG_MAINTAINER=${IMG_MAINTAINER} 
+        - LANG=${LANG}
+        - LANGUAGE=${LANGUAGE}
+        - LOCALTIME=${LOCALTIME}
+       
     restart: unless-stopped