- Move all supervisor logs from /tmp to /var/log/supivisor,

- Add /var/log/init & var/log/supervisor volumes.

Dockerfile

@@ -1,26 +1,32 @@
-# Rx3 Server Mageia-9 Docker Image
+# Rx3-Docker/Server Docker Image
 #-------------------------------------------------------------------------------
 
-ARG IMG_URL_PREFIX="rx3"
+ARG IMG_FROM_URL="rx3-docker/base:latest"
 
-FROM ${IMG_URL_PREFIX}/base-mga9:1.2.3
+FROM ${IMG_FROM_URL}
 
 ARG IMG_NAME
-ARG IMG_FULL_NAME
+ARG IMG_NAME_FULL
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_NAME}.name=${IMG_FULL_NAME}
+LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
 LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
 LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
 LABEL maintainer=${IMG_MAINTAINER}
 
+ARG SERVER_LOG_INIT_DIR
+ARG SERVER_LOG_SV_DIR
+ARG SERVER_PORT_SV_INT
+
+ARG SERVER_LOG_INIT_FILE=${SERVER_LOG_INIT_DIR}/init.log
+
 
 
 #---------------------------------------------------------------------------------------------------
 ARG INIT_SHELL='#!/bin/bash                                                                      \n\
                                                                                                  \n\
-function log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a /var/log/init.log; }             \n\
+function log() { echo "$(date --rfc-3339=ns) Init: $*" | tee -a '${SERVER_LOG_INIT_FILE}'; }     \n\
                                                                                                  \n\
 log "Starting"                                                                                   \n\
                                                                                                  \n\
@@ -41,42 +47,58 @@ do
 done'
 #---------------------------------------------------------------------------------------------------
 
+#---------------------------------------------------------------------------------------------------
+ARG SUPERVISORD='#!/bin/bash                                                                     \n\
+                                                                                                 \n\
+exec supervisord -c /etc/supervisord.conf'
+#---------------------------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------------------------
+ARG CROND='#!/bin/bash                                                                           \n\
+                                                                                                 \n\
+if [[ "${SERVER_CROND_ENABLED}" != "TRUE" ]]                                                     \n\
+then                                                                                             \n\
+    mv /etc/supervisord.d/crond.ini /etc/supervisord.d/crond.ini.disabled                        \n\
+fi'
+#---------------------------------------------------------------------------------------------------
+
 #---------------------------------------------------------------------------------------------------
 ARG SUPERVISORD_INI='[inet_http_server]                                                          \n\
-port=*:9001                                                                                      \n\
+port=*:'${SERVER_PORT_SV_INT}'                                                                   \n\
                                                                                                  \n\
 [supervisord]                                                                                    \n\
 nodaemon=true                                                                                    \n\
+childlogdir='${SERVER_LOG_SV_DIR}'                                                               \n\
 user=root'      
 #---------------------------------------------------------------------------------------------------
 
-
 #---------------------------------------------------------------------------------------------------
 ARG CROND_INI='[program:crond]                                                                   \n\
 command=crond -n'
 #---------------------------------------------------------------------------------------------------
 
-#---------------------------------------------------------------------------------------------------
-ARG SUPERVISORD='#!/bin/bash                                                                     \n\
-                                                                                                 \n\
-exec supervisord -c /etc/supervisord.conf'
-#---------------------------------------------------------------------------------------------------
-
 
 
 RUN    urpmi --force supervisor                                                                                   \
-    && echo -e   "${INIT_SHELL}"          | sed -e 's/ *$//' >/usr/local/sbin/init.sh              \
+    && echo -e   "${INIT_SHELL}"          | sed -e "s/\`/'/g" -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  \
+    && mkdir     "${SERVER_LOG_INIT_DIR}"                                                                         \
-    && echo -e   "${CROND_INI}"           | sed -e 's/ *$//' > /etc/supervisord.d/crond.ini        \
+    && echo -e   "${CROND}"               | sed -e "s/\`/'/g" -e 's/ *$//'   > /etc/init.d/crond                  \
-    && echo -e   "${SUPERVISORD}"         | sed -e 's/ *$//' > /etc/init.d/supervisord             \
+    && echo -e   "${SUPERVISORD}"         | sed -e "s/\`/'/g" -e 's/ *$//'   > /etc/init.d/supervisord            \
+    && chmod a+x /etc/init.d/crond                                                                                \
     && chmod a+x /etc/init.d/supervisord                                                                          \
-    && ln   -s   /etc/init.d/supervisord /etc/rcD.d/S99supervisord
+    && ln   -s   /etc/init.d/crond                                             /etc/rcD.d/S60crond                \
+    && ln   -s   /etc/init.d/supervisord                                       /etc/rcD.d/S99supervisord          \
+    && echo -e   "${CROND_INI}"           | sed -e "s/\`/'/g" -e 's/ *$//'   > /etc/supervisord.d/crond.ini       \
+    && echo -e   "${SUPERVISORD_INI}"     | sed -e "s/\`/'/g" -e 's/ *$//'   > /etc/supervisord.d/supervisord.ini
 
 
-EXPOSE 9001
+VOLUME ${SERVER_LOG_INIT_DIR}
+VOLUME ${SERVER_LOG_SV_DIR}
+
+EXPOSE ${SERVER_PORT_SV_INT}
 
 CMD []
 ENTRYPOINT ["init.sh"]

ReadMe.txt

@@ -1,14 +1,15 @@
-Welcome to Rx3/Server-Mga9 docker image!
+Welcome to Rx3-Docker/Server docker image!
 
 
 
-This is project aims to build a Mageia-9 server docker image to be used by others Rx3 packaging projects.
+This project aims to build a Mageia server docker image to be used by other Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3/base-mga9:1.2.3 image,
+    - Curtently based on rx3-docker/base:1.3.0-mga9 image,
     - Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d,
     - supervisord managing services,
-    - crond & logrotate configured.
+    - crond & logrotate configured & crond disabled by default,
+    - Export init & supivisor log directories as volume.
 
 
 Enjoy it!
@@ -16,4 +17,4 @@ Enjoy it!
 Your Rx3 Team.
 
 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3/server-mga9
+https://git.rx3.org/gitea/rx3-docker/server

ReleaseNotes.txt

@@ -1,3 +1,34 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Server V 1.2.0 - A. GIBERT - 2024/11/10
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move & Rename repo from Rx3/Server-MGA9 to Rx3-Docker/Server,
+- New version naming standard,
+- Now use docker_tools for .env building,
+- Use now rx3-docker/base:1.3.0-mga9 image,
+- Add crond enabling via SERVER_CROND_ENABLE environement variable,
+- Add /var/log/init & var/log/supervisor volumes.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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
 ------------------------------------------------------------------------------------------------------------------------------------

compose.yaml

@@ -1,4 +1,4 @@
-# Rx3 Server Mageia-9 Docker Image
+# Rx3-Docker/Server Docker Image
 #-------------------------------------------------------------------------------
 
 name:                           ${IMG_NAME}
@@ -7,19 +7,31 @@ services:
 
   server:
     container_name:             ${IMG_NAME}
+    hostname:                   ${IMG_NAME}
     
     image:                      ${IMG_URL}
     
     build:
       context:                  .
       args:
-        - IMG_NAME=${IMG_NAME}
+        IMG_NAME:               ${IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
+        IMG_NAME_FULL:          ${IMG_NAME_FULL}
-        - IMG_VERSION=${IMG_VERSION}
+        IMG_VERSION:            ${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
+        IMG_MAINTAINER:         ${IMG_MAINTAINER}
-        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
+        IMG_FROM_URL:           ${IMG_FROM_URL}
+
+        SERVER_LOG_INIT_DIR:    ${SERVER_LOG_INIT_DIR}
+        SERVER_LOG_SV_DIR:      ${SERVER_LOG_SV_DIR}
+        SERVER_PORT_SV_INT:     ${SERVER_PORT_SV_INT}
        
     restart:                    unless-stopped
 
+    environment:
+      SERVER_CROND_ENABLED:     ${SERVER_CROND_ENABLED}
+      
+    volumes:
+      - ./var/log/init:${SERVER_LOG_INIT_DIR}
+      - ./var/log/supervisor:${SERVER_LOG_SV_DIR}
+
     ports:
-      - "127.0.0.1:9010:9001"
+      - "127.0.0.1:${SERVER_PORT_SV_EXT}:${SERVER_PORT_SV_INT}"

env.dist

@@ -1,13 +1,14 @@
-# Rx3 Server Mageia-9 Docker Image
+# Rx3-Docker/Server Docker Image
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Global Settings
 #-------------------------------------------------------------------------------
 
-IMG_ORG="rx3"
+ORG_NAME="rx3-docker"
-IMG_REGISTRY="docker.xor.rx3:5000"
+ORG_REGISTRY="docker.xor.rx3:5000"
-IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
+
+ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 
 
 
@@ -15,14 +16,31 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_NAME="server-mga9"
+IMG_NAME="server"
-IMG_FULL_NAME="Rx3 Server Mageia-9 Docker Image"
+IMG_NAME_FULL="Rx3-Docker/Server Docker Image"
-IMG_VERSION="1.1.1"
+IMG_VERSION="1.2.0-mga9"
-IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
+IMG_URL_PREFIX="${ORG_URL_PREFIX}"
+IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
+
+IMG_FROM_URL="${ORG_URL_PREFIX}/base:1.3.0-mga9"
+
 
 
 #-------------------------------------------------------------------------------
 # User Settings
 #-------------------------------------------------------------------------------
+
+ENV_PORT_OFFSET=0
+SV_PORT_OFFSET=1000
+
+SERVER_PORT_MAIN_EXT=$(( 8080 + ${ENV_PORT_OFFSET}))
+
+SERVER_PORT_SV_EXT=$(( ${SERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
+SERVER_PORT_SV_INT=9001
+
+SERVER_LOG_INIT_DIR="/var/log/init"
+SERVER_LOG_SV_DIR="/var/log/supervisor"
+
+SERVER_CROND_ENABLED="FALSE"

var/log/init/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

var/log/supervisor/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore