Dockerfile

@@ -1,33 +1,25 @@
-# Rx3-Docker/RabbitMQ Docker Image
+# Rx3 RabbitMQ Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
-ARG IMG_FROM_URL="rx3-docker/server:latest"
+ARG IMG_URL_PREFIX="rx3"
 
-FROM ${IMG_FROM_URL}
+FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3
 
 ARG IMG_NAME
-ARG IMG_NAME_FULL
+ARG IMG_FULL_NAME
 ARG IMG_VERSION
 ARG IMG_MAINTAINER
 
-LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
+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}
 
-ARG RABBITMQ_LIB
-ARG RABBITMQ_PORT_MAIN
-ARG RABBITMQ_PORT_ADMIN
-ARG POSTRMQ_LOG_DIR
-
-ARG POSTRMQ_LOG_FILE="${POSTRMQ_LOG_DIR}/postrmq.log"
 
 ARG RABBITMQ_LIB=/var/lib/rabbitmq
 ARG RABBITMQ_PORT=5672
 ARG RABBITMQ_ADMIN_PORT=15672
 
-
-
 #-------------------------------------------------------------------------------------------------------------------
 ARG RABBITMQD='#!/bin/bash                                                                                       \n\
                                                                                                                  \n\
@@ -46,7 +38,7 @@ user=root'
 #-------------------------------------------------------------------------------------------------------------------
 ARG POSTRMQ='#!/bin/bash                                                                                         \n\
                                                                                                                  \n\
-function log() { echo "$(date --rfc-3339=ns) PostRMQ: $*" | tee -a '${POSTRMQ_LOG_FILE}'; }                      \n\
+function log() { echo "$(date --rfc-3339=ns) PostRMQ: $*" | tee -a /var/log/postrmq.log; }                       \n\
                                                                                                                  \n\
 log "Starting"                                                                                                   \n\
                                                                                                                  \n\
@@ -95,5 +87,5 @@ RUN    urpmi --force lksctp-tools \
 
 VOLUME ${RABBITMQ_LIB}
 
-EXPOSE ${RABBITMQ_PORT_MAIN}
+EXPOSE ${RABBITMQ_ADMIN_PORT}
-EXPOSE ${RABBITMQ_PORT_ADMIN}
+EXPOSE ${RABBITMQ_ADMIN_PORT}

ReadMe.txt

@@ -1,15 +1,15 @@
-Welcome to Rx3-Docker/RabbitMQ docker image!
+Welcome to Rx3/RabbitMQ-Mga9 docker image!
 
 
 
-This project aims to build a RabbitMQ docker image used by others Rx3 packaging projects.
+This is project aims to build a RabbitMQ + Mageia 9 docker image used by others Rx3 packaging projects.
 
 Features:
-    - Curtently based on rx3-docker/server:1.2.0-mga9 image,
+    - Curtently based on rx3/server-mga9:1.1.3 image,
     - Fallback on RabbitMQ 3.8.18 from Mageia 8 next to broken Mageia 9 version!
     - Following env vars supported:
        - RABBITMQ_UID & RABBITMQ_GID,
-    - Management plugin enabled.
+    - Management olugin enabled.
 
 
 Enjoy it!
@@ -18,4 +18,4 @@ Your Rx3 Team.
 
 --
 arnaud@rx3.net
-https://git.rx3.org/gitea/rx3-docker/rabbitmq
+https://git.rx3.org/gitea/rx3/rabbitmq-mga9

ReleaseNotes.txt

@@ -1,16 +1,3 @@
-------------------------------------------------------------------------------------------------------------------------------------
-Rx3-Docker/RabbitMQ V 1.1.0 - A. GIBERT - 2024/11/12
-------------------------------------------------------------------------------------------------------------------------------------
-
-- Move & Rename repo from Rx3/RabbitMQ-MGA9 to Rx3-Docker/RabbitMQ,
-- New version naming standard,
-- Now use docker_tools for .env building,
-- Use now rx3-docker/server:1.2.0-mga9 image,
-- Add /var/log/init & /var/log/supervisor volumes,
-- Add healthcheck example in compose file.
-
-
-
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/RabbitMQ-Mga9 V 1.0.2 - A. GIBERT - 2024/11/01
 ------------------------------------------------------------------------------------------------------------------------------------

compose.yaml

@@ -1,4 +1,4 @@
-# Rx3-Docker/RabbitMQ Docker Image
+# Rx3 RabbitMQ Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
 name: ${IMG_NAME}
@@ -14,16 +14,11 @@ services:
     build:
       context: .
       args:
-        IMG_NAME:               ${IMG_NAME}
+        - IMG_NAME=${IMG_NAME}
-        IMG_NAME_FULL:          ${IMG_NAME_FULL}
+        - IMG_FULL_NAME=${IMG_FULL_NAME}
-        IMG_VERSION:            ${IMG_VERSION}
+        - IMG_VERSION=${IMG_VERSION}
-        IMG_MAINTAINER:         ${IMG_MAINTAINER}
+        - IMG_MAINTAINER=${IMG_MAINTAINER}
-        IMG_FROM_URL:           ${IMG_FROM_URL}
+        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
-
-        RABBITMQ_LIB:           ${MQSERVER_LIB_DIR}
-        RABBITMQ_PORT_MAIN:     ${MQSERVER_PORT_MAIN_INT}
-        RABBITMQ_PORT_ADMIN:    ${MQSERVER_PORT_ADMIN_INT}
-        POSTRMQ_LOG_DIR:        ${MQSERVER_LOG_POSTRMQ_DIR}
         
     restart: unless-stopped
     
@@ -31,20 +26,12 @@ services:
       RABBITMQ_UID:               ${RABBITMQ_UID}
       RABBITMQ_GID:               ${RABBITMQ_GID}
       
-    healthcheck:
-        test: ["CMD", "curl", "-f", "http://localhost:${MQSERVER_PORT_ADMIN_INT}"]
-        interval:                   30s
-        timeout:                    10s
-        start_period:               60s
-        start_interval:             10s
-        retries:                    30
-
     volumes:
-      - ./var/lib/rabbitmq:${MQSERVER_LIB_DIR}
+      - ./var/lib/rabbitmq:/var/lib/rabbitmq
-      - ./var/log/init:${MQSERVER_LOG_INIT_DIR}
+      
-      - ./var/log/supervisor:${MQSERVER_LOG_SV_DIR}
+    network_mode: bridge
     
     ports:
-      - "127.0.0.1:${MQSERVER_PORT_SV_EXT}:${MQSERVER_PORT_SV_INT}"
+      - "127.0.0.1:${MQSERVER_SV_PORT}:9001"
-      - "127.0.0.1:${MQSERVER_PORT_MAIN_EXT}:${MQSERVER_PORT_MAIN_INT}"
+      - "127.0.0.1:${MQSERVER_PORT}:5672"
-      - "127.0.0.1:${MQSERVER_PORT_ADMIN_EXT}:${MQSERVER_PORT_ADMIN_INT}"
+      - "127.0.0.1:${MQSERVER_ADMIN_PORT}:15672"

env

@@ -1,14 +1,13 @@
-# Rx3-Docker/RabbitMQ Docker Image
+# Rx3 RabbitMQ Mageia-9 Docker Image
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Global Settings
 #-------------------------------------------------------------------------------
 
-ORG_NAME="rx3-docker"
+IMG_ORG="rx3"
-ORG_REGISTRY="docker.xor.rx3:5000"
+IMG_REGISTRY="docker.xor.rx3:5000"
-
+IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
-ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 
 
 
@@ -16,15 +15,11 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
 # Image Settings
 #-------------------------------------------------------------------------------
 
-IMG_NAME="rabbitmq"
+IMG_NAME="rabbitmq-mga9"
-IMG_NAME_FULL="Rx3-Docker/PostgreSQL Docker Image"
+IMG_FULL_NAME="Rx3 RabbitMQ Mageia-9 Docker Image"
-IMG_VERSION="1.1.0-mga9"
+IMG_VERSION="1.0.2"
-IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
-
-IMG_URL_PREFIX="${ORG_URL_PREFIX}"
 IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
-
+IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
-IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
 
 
 
@@ -35,19 +30,9 @@ IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
 ENV_PORT_OFFSET=0
 SV_PORT_OFFSET=1000
 
-MQSERVER_PORT_MAIN_EXT=$(( 8072 + ${ENV_PORT_OFFSET}))
+MQSERVER_PORT=$(( 8072 + ${ENV_PORT_OFFSET}))
-MQSERVER_PORT_MAIN_INT=5672
+MQSERVER_ADMIN_PORT=$(( 8073 + ${ENV_PORT_OFFSET}))
-
+MQSERVER_SV_PORT=$(( ${MQSERVER_PORT} + ${SV_PORT_OFFSET}))
-MQSERVER_PORT_ADMIN_EXT=$(( 8073 + ${ENV_PORT_OFFSET}))
-MQSERVER_PORT_ADMIN_INT=15672
-
-MQSERVER_PORT_SV_EXT=$(( ${MQSERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
-MQSERVER_PORT_SV_INT=9001
-
-MQSERVER_LIB_DIR="/var/lib/pgsql"
-MQSERVER_LOG_INIT_DIR="/var/log/init"
-MQSERVER_LOG_SV_DIR="/var/log/supervisor"
-MQSERVER_LOG_POSTRMQ_DIR="${MQSERVER_LOG_SV_DIR}"
 
 RABBITMQ_UID=480
 RABBITMQ_GID=398

var/log/init/.gitignore

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

var/log/supervisor/.gitignore

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