From 4fda154917d5c8c6f52f639751cf0ae50dea421b Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Wed, 28 Aug 2024 16:14:02 +0200
Subject: [PATCH] - Use now rx3/base-mga9:1.2.4 image.

---
 .env             |  2 +-
 Dockerfile       | 20 ++++++++++----------
 ReadMe.txt       |  2 +-
 ReleaseNotes.txt |  8 ++++++++
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index 5d64e93..2cd3e6f 100644
--- a/.env
+++ b/.env
@@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 
 IMG_NAME="server-mga9"
 IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image"
-IMG_VERSION="1.1.1"
+IMG_VERSION="1.1.2"
 IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
diff --git a/Dockerfile b/Dockerfile
index 45423aa..2d8531c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG IMG_URL_PREFIX="rx3"
 
-FROM ${IMG_URL_PREFIX}/base-mga9:1.2.3
+FROM ${IMG_URL_PREFIX}/base-mga9:1.2.4
 
 ARG IMG_NAME
 ARG IMG_FULL_NAME
@@ -64,15 +64,15 @@ exec supervisord -c /etc/supervisord.conf'
 
 
 
-RUN    urpmi --force supervisor                                                                    \
-    && echo -e   "${INIT_SHELL}"          | sed -e 's/ *$//' >/usr/local/sbin/init.sh              \
-    && chmod a+x /usr/local/sbin/init.sh                                                           \
-    && 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   "${SUPERVISORD}"         | sed -e 's/ *$//' > /etc/init.d/supervisord             \
-    && chmod a+x /etc/init.d/supervisord                                                           \
+RUN    urpmi --force supervisor                                                                                   \
+    && echo -e   "${INIT_SHELL}"          | sed -e 's/ *$//' >/usr/local/sbin/init.sh                             \
+    && chmod a+x /usr/local/sbin/init.sh                                                                          \
+    && mkdir     /etc/rc.d/rcD.d                                                                                  \
+    && ln   -s   /etc/rc.d/rcD.d /etc                                                                             \
+    && echo -e   "${SUPERVISORD_INI}"     | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/supervisord.ini   \
+    && echo -e   "${CROND_INI}"           | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/crond.ini         \
+    && echo -e   "${SUPERVISORD}"         | sed -e "s/\`/'/g" -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 e8bb95d..87a1712 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.3 image,
+    - Curtently based on rx3/base-mga9:1.2.4 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 77b3e58..e9586bd 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,11 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Server-Mga9 V 1.1.2 - A. GIBERT - 2024/08/28
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3/base-mga9:1.2.4 image.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/Server-Mga9 V 1.1.1 - A. GIBERT - 2024/08/27
 ------------------------------------------------------------------------------------------------------------------------------------