- 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.

compose.yaml

@@ -1,37 +1,50 @@
-# Rx3 RabbitMQ Mageia-9 Docker Image
+# Rx3-Docker/RabbitMQ Docker Image
 #-------------------------------------------------------------------------------
 
-name: ${IMG_NAME}
+name:                           ${IMG_NAME}
 
 services:
 
   mqserver:
-    container_name: ${IMG_NAME}
-    hostname: ${IMG_NAME}
+    container_name:             ${IMG_NAME}
+    hostname:                   ${IMG_NAME}
     
-    image: ${IMG_URL}
+    image:                      ${IMG_URL}
 
     build:
-      context: .
+      context:                  .
       args:
-        - IMG_NAME=${IMG_NAME}
-        - IMG_FULL_NAME=${IMG_FULL_NAME}
-        - IMG_VERSION=${IMG_VERSION}
-        - IMG_MAINTAINER=${IMG_MAINTAINER}
-        - IMG_URL_PREFIX=${IMG_URL_PREFIX}
-        
-    restart: unless-stopped
+        IMG_NAME:               ${IMG_NAME}
+        IMG_NAME_FULL:          ${IMG_NAME_FULL}
+        IMG_VERSION:            ${IMG_VERSION}
+        IMG_MAINTAINER:         ${IMG_MAINTAINER}
+        IMG_FROM_URL:           ${IMG_FROM_URL}
+
+        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
     
     environment:
-      RABBITMQ_UID:               ${RABBITMQ_UID}
-      RABBITMQ_GID:               ${RABBITMQ_GID}
-      
+      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:/var/lib/rabbitmq
-      
-    network_mode: bridge
-    
+      - ./var/lib/rabbitmq:${MQSERVER_LIB_DIR}
+      - ./var/log/init:${MQSERVER_LOG_INIT_DIR}
+      - ./var/log/supervisor:${MQSERVER_LOG_SV_DIR}
+
     ports:
-      - "127.0.0.1:${MQSERVER_SV_PORT}:9001"
-      - "127.0.0.1:${MQSERVER_PORT}:5672"
-      - "127.0.0.1:${MQSERVER_ADMIN_PORT}:15672"
+      - "127.0.0.1:${MQSERVER_PORT_SV_EXT}:${MQSERVER_PORT_SV_INT}"
+      - "127.0.0.1:${MQSERVER_PORT_MAIN_EXT}:${MQSERVER_PORT_MAIN_INT}"
+      - "127.0.0.1:${MQSERVER_PORT_ADMIN_EXT}:${MQSERVER_PORT_ADMIN_INT}"