From 54c9fc477c829808f6613fd14afa876e506f6a87 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Tue, 27 Aug 2024 00:33:11 +0200
Subject: [PATCH] - Minor compose / dockerfile args & structure improvements, -
 Use now rx3/base-mga9:1.2.3 image.

---
 .env             |  8 ++++----
 Dockerfile       | 12 ++++++------
 ReadMe.txt       |  2 +-
 ReleaseNotes.txt |  9 +++++++++
 compose.yaml     |  6 +++---
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.env b/.env
index 8771cb1..5d64e93 100644
--- a/.env
+++ b/.env
@@ -15,10 +15,10 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_ID="server-mga9"
-IMG_NAME="Rx3 Server Mageia-9 Docker Image"
-IMG_VERSION="1.1.0"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}"
+IMG_NAME="server-mga9"
+IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image"
+IMG_VERSION="1.1.1"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 
diff --git a/Dockerfile b/Dockerfile
index d660b4e..45423aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,16 +3,16 @@
 
 ARG IMG_URL_PREFIX="rx3"
 
-FROM ${IMG_URL_PREFIX}/base-mga9:1.2.2
+FROM ${IMG_URL_PREFIX}/base-mga9:1.2.3
 
-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}
 
 
@@ -70,7 +70,7 @@ RUN    urpmi --force supervisor
     && mkdir     /etc/rc.d/rcD.d                                                                   \
     && ln   -s   /etc/rc.d/rcD.d /etc                                                              \
     && echo -e   "${SUPERVISORD_INI}"     | sed -e 's/ *$//' > /etc/supervisord.d/supervisord.ini  \
-    && echo -e   "${CROND_INI}"            | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini       \
+    && echo -e   "${CROND_INI}"           | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini        \
     && echo -e   "${SUPERVISORD}"         | sed -e 's/ *$//' > /etc/init.d/supervisord             \
     && chmod a+x /etc/init.d/supervisord                                                           \
     && ln   -s   /etc/init.d/supervisord /etc/rcD.d/S99supervisord
diff --git a/ReadMe.txt b/ReadMe.txt
index f29b6cf..e8bb95d 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,7 +5,7 @@ Welcome to Rx3/Server-Mga9 docker image!
 This is project aims to build a Mageia-9 server docker image to be used by others Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3/base-mga9:1.2.2 image,
+    - Curtently based on rx3/base-mga9:1.2.3 image,
     - Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
     - supervisord managing services,
     - crond & logrotate configured.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 18aad58..77b3e58 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,12 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Server-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Minor compose / dockerfile args & structure improvements,
+- Use now rx3/base-mga9:1.2.3 image.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/Server-Mga9 V 1.1.0 - A. GIBERT - 2024/08/26
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/compose.yaml b/compose.yaml
index 07055de..11c494a 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,20 +1,20 @@
 # Rx3 Server Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_ID}
+name: ${IMG_NAME}
 
 services:
 
   server:
-    container_name: ${IMG_ID}
+    container_name: ${IMG_NAME}
     
     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}
         - IMG_URL_PREFIX=${IMG_URL_PREFIX}