- Use now rx3/base-mga9:1.2.6 image,

- Variabilization of external server ports in env & compose file,
- Use now docker_tools for .env building.

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.6
 
-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}
 
 
@@ -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
     
 

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.6 image,
     - Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
     - supervisord managing services,
     - crond & logrotate configured.

ReleaseNotes.txt

@@ -1,3 +1,30 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Server-Mga9 V 1.1.3 - A. GIBERT - 2024/10/05
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Use now rx3/base-mga9:1.2.6 image,
+- Variabilization of external server ports in env & compose file,
+- Use now docker_tools for .env building.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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
+------------------------------------------------------------------------------------------------------------------------------------
+
+- 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
 ------------------------------------------------------------------------------------------------------------------------------------

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}
@@ -22,4 +22,4 @@ services:
     restart: unless-stopped
 
     ports:
-      - "127.0.0.1:9010:9001"
+      - "127.0.0.1:${SERVER_SV_PORT}:9001"

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.3"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 
@@ -26,3 +26,10 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 #-------------------------------------------------------------------------------
 # User Settings
 #-------------------------------------------------------------------------------
+
+ENV_PORT_OFFSET=0
+SV_PORT_OFFSET=1000
+
+SERVER_PORT=$(( 8080 + ${ENV_PORT_OFFSET}))
+SERVER_SV_PORT=$(( ${SERVER_PORT} + ${SV_PORT_OFFSET}))
+