From bc3d6d4a76fb05f90da6453b937d51ed2c3440da Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Sun, 25 Aug 2024 18:12:54 +0200
Subject: [PATCH] - Remove entrypoint now implemented by rx3/server-mga9 image,
 - Minor compose / dockerfile args improvments.

---
 .env             | 27 +++++++++++++++++++++++++--
 Dockerfile       |  3 ++-
 ReadMe.txt       |  2 +-
 ReleaseNotes.txt |  9 +++++++++
 compose.yaml     |  2 +-
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index c53d212..b0c9531 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,32 @@
+# 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_ID="base-mga9"
 IMG_NAME="Rx3 Base Mageia-9 Docker Image"
-IMG_VERSION="1.2.1"
+IMG_VERSION="1.2.2"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${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"
diff --git a/Dockerfile b/Dockerfile
index 6eeb366..bd8de29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,4 +36,5 @@ LABEL maintainer=${IMG_MAINTAINER}
 
 COPY --from=0 / /
 
-ENTRYPOINT ["sleep", "60m"]
+CMD ["/bin/bash"]
+ENTRYPOINT []
diff --git a/ReadMe.txt b/ReadMe.txt
index 816fb86..c0fccbc 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,4 +1,4 @@
-Welcome to base-mga9 docker image!
+Welcome to Rx3/Base-Mga9 docker image!
 
 
 
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 7235aaf..d05c237 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,12 @@
+------------------------------------------------------------------------------------------------------------------------------------
+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.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Base-Mga9 V 1.2.1 - A. GIBERT - 2024/08/24
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/compose.yaml b/compose.yaml
index 55f2c9d..d217b0e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -8,7 +8,7 @@ services:
   default:
     container_name: ${IMG_ID}
     
-    image: docker.xor.rx3:5000/rx3/${IMG_ID}:${IMG_VERSION}
+    image: ${IMG_URL}
     
     build:
       context: .