Rx3-Docker/rabbitmq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

- Use now rx3-docker/server:1.2.2-mga9 image,

Browse Source 
- Clean-up env.dist.
This commit is contained in:
Arnaud G. GIBERT 2025-04-21 19:53:54 +02:00
parent 170fe36742
commit 8e4149231b
5 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfile
View File

@ -83,16 +83,17 @@ command=/usr/local/sbin/postrmq'
RUN urpmi --force lksctp-tools \ RUN urpmi.update -a \
&& urpmi --force lksctp-tools \
&& rpm -Uvh ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-erts-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-crypto-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-kernel-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-stdlib-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-syntax_tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-hipe-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-compiler-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-mnesia-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-runtime_tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-asn1-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-public_key-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-ssl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-inets-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-sasl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-eldap-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-snmp-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-os_mon-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/release/erlang-sd_notify-1.1-1.mga8.noarch.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-xmerl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/rabbitmq-server-3.8.18-1.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/lib64openssl1.1-1.1.1v-1.mga8.x86_64.rpm \ && rpm -Uvh ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-erts-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-crypto-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-kernel-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-stdlib-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-syntax_tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-hipe-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-compiler-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-mnesia-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-runtime_tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-asn1-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-public_key-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-ssl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-inets-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-sasl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-eldap-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-snmp-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-os_mon-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/release/erlang-sd_notify-1.1-1.mga8.noarch.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-xmerl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/rabbitmq-server-3.8.18-1.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/lib64openssl1.1-1.1.1v-1.mga8.x86_64.rpm \
&& rabbitmq-plugins enable rabbitmq_management \ && rabbitmq-plugins enable rabbitmq_management \
&& echo -e "${RABBITMQD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/rabbitmqd \ && echo -e "${RABBITMQD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/rabbitmqd \
&& chmod a+x /etc/init.d/rabbitmqd \ && chmod a+x /etc/init.d/rabbitmqd \
&& ln -s /etc/init.d/rabbitmqd /etc/rcD.d/S40rabbitmqd \ && ln -s /etc/init.d/rabbitmqd /etc/rcD.d/S40rabbitmqd \
&& echo -e "${RABBITMQD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/rabbitmqd.ini \ && echo -e "${RABBITMQD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/rabbitmqd.ini \
&& echo -e "${POSTRMQ}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/postrmq \ && echo -e "${POSTRMQ}" | sed -e "s/\`/'/g" -e 's/ *$//' > /usr/local/sbin/postrmq \
&& chmod a+x /usr/local/sbin/postrmq \ && chmod a+x /usr/local/sbin/postrmq \
&& echo -e "${POSTRMQ_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postrmq.ini && echo -e "${POSTRMQ_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/postrmq.ini

2
ReadMe.txt
View File

@ -5,7 +5,7 @@ Welcome to Rx3-Docker/RabbitMQ docker image!
This project aims to build a RabbitMQ docker image used by others Rx3 packaging projects. This project aims to build a RabbitMQ docker image used by others Rx3 packaging projects.
Features: Features:
- Curtently based on rx3-docker/server:1.2.1-mga9 image, - Curtently based on rx3-docker/server:1.2.2-mga9 image,
- Fallback on RabbitMQ 3.8.18 from Mageia 8 next to broken Mageia 9 version! - Fallback on RabbitMQ 3.8.18 from Mageia 8 next to broken Mageia 9 version!
- Following env vars supported: - Following env vars supported:
- RABBITMQ_UID & RABBITMQ_GID, - RABBITMQ_UID & RABBITMQ_GID,

9
ReleaseNotes.txt
View File

@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/RabbitMQ V 1.1.2 - A. GIBERT - 2025/04/21
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.2-mga9 image,
- Clean-up env.dist.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/RabbitMQ V 1.1.1 - A. GIBERT - 2025/03/08 Rx3-Docker/RabbitMQ V 1.1.1 - A. GIBERT - 2025/03/08
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

48
compose.yaml
View File

@ -1,39 +1,39 @@
# Rx3-Docker/RabbitMQ Docker Image # Rx3-Docker/RabbitMQ Docker Image
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: ${IMG_NAME} name: ${MQS_IMG_NAME}
services: services:
mqserver: mqserver:
container_name: ${IMG_NAME} container_name: ${MQS_IMG_NAME}
hostname: ${IMG_NAME} hostname: ${MQS_IMG_NAME}
image: ${IMG_URL} image: ${MQS_IMG_URL}
build: build:
context: . context: .
args: args:
IMG_NAME: ${IMG_NAME} IMG_NAME: ${MQS_IMG_NAME}
IMG_NAME_FULL: ${IMG_NAME_FULL} IMG_NAME_FULL: ${MQS_IMG_NAME_FULL}
IMG_VERSION: ${IMG_VERSION} IMG_VERSION: ${MQS_IMG_VERSION}
IMG_MAINTAINER: ${IMG_MAINTAINER} IMG_MAINTAINER: ${MQS_IMG_MAINTAINER}
IMG_FROM_URL: ${IMG_FROM_URL} IMG_FROM_URL: ${MQS_IMG_FROM_URL}
RABBITMQ_LIB: ${MQSERVER_LIB_DIR} RABBITMQ_LIB: ${MQS_LIB_INT}
RABBITMQ_LOG: ${MQSERVER_LOG_RABBITMQ_DIR} RABBITMQ_LOG: ${MQS_LOG_MAIN_INT}
RABBITMQ_PORT_MAIN: ${MQSERVER_PORT_MAIN_INT} RABBITMQ_PORT_MAIN: ${MQS_PORT_MAIN_INT}
RABBITMQ_PORT_ADMIN: ${MQSERVER_PORT_ADMIN_INT} RABBITMQ_PORT_ADMIN: ${MQS_PORT_ADMIN_INT}
POSTRMQ_LOG_DIR: ${MQSERVER_LOG_POSTRMQ_DIR} POSTRMQ_LOG_DIR: ${MQS_LOG_SV_INT}
restart: unless-stopped restart: unless-stopped
environment: environment:
RABBITMQ_UID: ${RABBITMQ_UID} RABBITMQ_UID: ${MQS_USER_ID}
RABBITMQ_GID: ${RABBITMQ_GID} RABBITMQ_GID: ${MQS_GROUP_ID}
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${MQSERVER_PORT_ADMIN_INT}"] test: ["CMD", "curl", "-f", "http://localhost:${MQS_PORT_ADMIN_INT}"]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
start_period: 60s start_period: 60s
@ -41,12 +41,12 @@ services:
retries: 30 retries: 30
volumes: volumes:
- ./var/lib/rabbitmq:${MQSERVER_LIB_DIR} - ./${MQS_LIB_EXT}:${MQS_LIB_INT}
- ./var/log/init:${MQSERVER_LOG_INIT_DIR} - ./${MQS_LOG_INIT_EXT}:${MQS_LOG_INIT_INT}
- ./var/log/supervisor:${MQSERVER_LOG_SV_DIR} - ./${MQS_LOG_SV_EXT}:${MQS_LOG_SV_INT}
- ./var/log/rabbitmq:${MQSERVER_LOG_RABBITMQ_DIR} - ./${MQS_LOG_MAIN_EXT}:${MQS_LOG_MAIN_INT}
ports: ports:
- "127.0.0.1:${MQSERVER_PORT_SV_EXT}:${MQSERVER_PORT_SV_INT}" - "127.0.0.1:${MQS_PORT_SV_EXT}:${MQS_PORT_SV_INT}"
- "127.0.0.1:${MQSERVER_PORT_MAIN_EXT}:${MQSERVER_PORT_MAIN_INT}" - "127.0.0.1:${MQS_PORT_MAIN_EXT}:${MQS_PORT_MAIN_INT}"
- "127.0.0.1:${MQSERVER_PORT_ADMIN_EXT}:${MQSERVER_PORT_ADMIN_INT}" - "127.0.0.1:${MQS_PORT_ADMIN_EXT}:${MQS_PORT_ADMIN_INT}"

51
env.dist
View File

@ -7,6 +7,7 @@
ORG_NAME="rx3-docker" ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000" ORG_REGISTRY="docker.xor.rx3:5000"
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
@ -16,15 +17,31 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
# Image Settings # Image Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
IMG_NAME="rabbitmq" HOST_NAME_PREFIX=""
IMG_NAME_FULL="Rx3-Docker/PostgreSQL Docker Image"
IMG_VERSION="1.1.1-mga9"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
IMG_URL_PREFIX="${ORG_URL_PREFIX}" PORT_ENV_OFFSET=0
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.1-mga9" PORT_SV_INT=9001
PORT_SV_OFFSET=1000
NETWORK_NAME=${HOST_NAME_PREFIX}
NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV}
DOCKER_TOOLS_DEBUG=FALSE
DOCKER_TOOLS_VOLUME=SINGLE
#DOCKER_TOOLS_VOLUME=MIXED
#DOCKER_TOOLS_VOLUME=MERGED
#DOCKER_TOOLS_VOLUME=SPLIT
#DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
#------------------+----------+--------------------------+--------------------+------------------+------------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
#------------------+----------+--------------------------+--------------------+------------------+------------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
docker_service_add MQS mqserver ${ORG_URL_PREFIX} rabbitmq "Rx3-Docker/RabbitMQ Docker Image" 1.1.2-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 - - 8072 5672 8073 15672 480 398
@ -32,23 +49,3 @@ IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.1-mga9"
# User Settings # User Settings
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ENV_PORT_OFFSET=0
SV_PORT_OFFSET=1000
MQSERVER_PORT_MAIN_EXT=$(( 8072 + ${ENV_PORT_OFFSET}))
MQSERVER_PORT_MAIN_INT=5672
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/rabbitmq"
MQSERVER_LOG_INIT_DIR="/var/log/init"
MQSERVER_LOG_SV_DIR="/var/log/supervisor"
MQSERVER_LOG_RABBITMQ_DIR="/var/log/rabbitmq"
MQSERVER_LOG_POSTRMQ_DIR="${MQSERVER_LOG_SV_DIR}"
RABBITMQ_UID=480
RABBITMQ_GID=398